Skip to content

Commit 2409da0

Browse files
committed
Update test suits and fix some internal issues for smart routing fallback state
1 parent 31740c6 commit 2409da0

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

src/__specs__/single-chain-ethereum.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Address, Amount } from "@safeblock/blockchain-utils"
2+
import { describe, expect, it } from "vitest"
23
import runSingleChainTests from "~/__specs__/utils/run-single-chain-tests"
34
import { PriceStorageExtension } from "~/extensions"
45
import { SdkException } from "~/index"
5-
import { bnbDAI, bnbUSDT, sdkConfig } from "./utils/sdk-test-config"
66
import SafeBlockSDK from "~/sdk"
77
import { ExchangeRequest } from "~/types"
8-
import { describe, expect, it } from "vitest"
8+
import { bnbDAI, bnbUSDT, sdkConfig } from "./utils/sdk-test-config"
99

1010
describe("Single chain exchanges in Ethereum networks", async () => {
1111
const sdk = new SafeBlockSDK(sdkConfig)

src/sdk/evm-converter/evm-converter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ export default class EvmConverter extends ExchangeConverter {
221221
headers: this.sdkConfig.backend?.headers,
222222
bannedDexIds: this.sdkInstance.dexBlacklist.toArray(),
223223
fromToken: request.tokenIn,
224-
toToken: tokenOut,
225-
amountInRaw: smartRoutingAvailable ? request.amountIn.toString() : undefined
224+
toToken: tokenOut
226225
})
227226
))
228227
))

src/utils/get-exchange-routes.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Address, arrayUtils } from "@safeblock/blockchain-utils"
22
import { BackendResponse, BasicToken, RouteStep } from "~/types"
33
import LimitedMap from "~/utils/limited-map"
44
import request from "~/utils/request"
5-
import IBackendRouteStep = BackendResponse.IBackendRouteStep
65
import IRoutesResponse = BackendResponse.IRoutesResponse
76
import IRoutesResponseNext = BackendResponse.IRoutesResponseNext
87

@@ -14,7 +13,6 @@ interface Options {
1413
headers?: Record<string, string>
1514
routeCacheTime?: number
1615

17-
amountInRaw?: string
1816
epsilon?: number
1917
maxPairsCount?: number
2018

@@ -29,7 +27,7 @@ export default async function getExchangeRoutes(options: Options): Promise<{ rou
2927
const routeKey = options.fromToken.address.toString() + options.toToken.address.toString()
3028
+ options.fromToken.network.name + options.toToken.network.name
3129
+ options.bannedDexIds?.join(",")
32-
+ options.amountInRaw + options.epsilon + options.maxPairsCount
30+
+ options.epsilon + options.maxPairsCount
3331

3432
const cachedRoute = routesCache.get(routeKey)
3533

@@ -47,7 +45,6 @@ export default async function getExchangeRoutes(options: Options): Promise<{ rou
4745
limit: 30,
4846
network: fromToken.network.chainId.toString(),
4947
banned_dex_ids: bannedDexIds?.length ? bannedDexIds.join(",") : null,
50-
amount: options.amountInRaw,
5148
epsilon: options.epsilon || null,
5249
max_pairs_count: options.maxPairsCount || null
5350
}
@@ -58,18 +55,9 @@ export default async function getExchangeRoutes(options: Options): Promise<{ rou
5855

5956
if (!rawRoutes) return { routes: [], percents: [] }
6057

61-
let plainRoutesList: IBackendRouteStep[][]
58+
const _rawRoutes = rawRoutes as BackendResponse.IRoutesResponse
6259

63-
if (options.amountInRaw) {
64-
const _rawRoutes = rawRoutes as BackendResponse.IRoutesResponseNext
65-
66-
plainRoutesList = _rawRoutes.route
67-
}
68-
else {
69-
const _rawRoutes = rawRoutes as BackendResponse.IRoutesResponse
70-
71-
plainRoutesList = [..._rawRoutes.items.swap.map(route => [route]), ..._rawRoutes.items.multiswap]
72-
}
60+
const plainRoutesList = [..._rawRoutes.items.swap.map(route => [route]), ..._rawRoutes.items.multiswap]
7361

7462
if (!plainRoutesList || plainRoutesList.length === 0) return { routes: [], percents: [] }
7563

vitest.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import * as path from "node:path"
22
import { defineConfig } from "vitest/config"
33

44
export default defineConfig({
5+
test: {
6+
testTimeout: 30_000
7+
},
58
resolve: {
69
alias: [
710
{ find: "~", replacement: path.resolve(__dirname, "./src/") }

0 commit comments

Comments
 (0)