fix test

Uniswap · Feb 6, 2025 · fc0fb89 · fc0fb89
1 parent d4d5bef
commit fc0fb89
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/sdks/router-sdk/src/entities/mixedRoute/route.test.ts b/sdks/router-sdk/src/entities/mixedRoute/route.test.ts
@@ -43,7 +43,6 @@ describe('MixedRoute', () => {
 
     it('real v3 weth pool and real v4 eth pool', () => {
       const route = new MixedRouteSDK([pool_v3_0_weth, pool_v4_weth_eth, pool_v4_1_eth], token0, token1)
-      console.log(JSON.stringify(route.path, null, 2))
       expect(route.path).toEqual([token0, weth, token1])
       expect(route.pools).toEqual([pool_v3_0_weth, pool_v4_1_eth])
     })
@@ -118,11 +117,21 @@ describe('MixedRoute', () => {
     })
 
     it('cannot wrap mixed route object with pure v4 route that converts ETH -> WETH ', () => {
-      expect(() => new MixedRouteSDK([pool_v4_1_eth, pool_v4_0_weth], token1, token0)).toThrow('PATH')
+      const route = new MixedRouteSDK([pool_v4_1_eth, pool_v4_0_weth], token1, token0)
+      expect(route.pools).toEqual([pool_v4_1_eth, pool_v4_0_weth])
+      expect(route.path).toEqual([token1, ETHER, token0])
+      expect(route.input).toEqual(token1)
+      expect(route.output).toEqual(token0)
+      expect(route.chainId).toEqual(1)
     })
 
     it('cannot wrap mixed route object with pure v4 route that converts WETH -> ETH ', () => {
-      expect(() => new MixedRouteSDK([pool_v4_0_weth, pool_v4_1_eth], token0, token1)).toThrow('PATH')
+      const route = new MixedRouteSDK([pool_v4_0_weth, pool_v4_1_eth], token0, token1)
+      expect(route.pools).toEqual([pool_v4_0_weth, pool_v4_1_eth])
+      expect(route.path).toEqual([token0, weth, token1])
+      expect(route.input).toEqual(token0)
+      expect(route.output).toEqual(token1)
+      expect(route.chainId).toEqual(1)
     })
 
     it('wraps complex mixed route object and successfully constructs a path from the tokens', () => {

diff --git a/sdks/router-sdk/src/entities/mixedRoute/route.ts b/sdks/router-sdk/src/entities/mixedRoute/route.ts
@@ -64,8 +64,8 @@ export class MixedRouteSDK<TInput extends Currency, TOutput extends Currency> {
 
       let outputToken
       if (
-        (pool instanceof V4Pool && !pool.involvesToken(inputToken) && !(prevPool instanceof V4Pool)) ||
-        (!(pool instanceof V4Pool) && inputToken.isNative && prevPool instanceof V4Pool)
+        (pool instanceof V4Pool && !pool.involvesToken(inputToken)) ||
+        (!(pool instanceof V4Pool) && inputToken.isNative)
       ) {
         // We handle the case where the inputToken =/= pool.token0 or pool.token1. There are 2 specific cases.
         if (inputToken.equals(pool.token0.wrapped)) {