From a5ddaa652e9d8f3641b5647efc8aa919955889a1 Mon Sep 17 00:00:00 2001 From: Bruno Eidam Guerios Date: Wed, 11 Dec 2024 14:12:03 -0300 Subject: [PATCH 1/2] Remove query specific integration tests --- .../swaps/v3/swapV3.integration.test.ts | 277 +----------------- test/lib/utils/addresses.ts | 4 +- 2 files changed, 4 insertions(+), 277 deletions(-) diff --git a/test/entities/swaps/v3/swapV3.integration.test.ts b/test/entities/swaps/v3/swapV3.integration.test.ts index 43ab20e1..0c68020a 100644 --- a/test/entities/swaps/v3/swapV3.integration.test.ts +++ b/test/entities/swaps/v3/swapV3.integration.test.ts @@ -15,10 +15,7 @@ import { CHAINS, ChainId, SwapKind, - Token, Swap, - ExactInQueryOutput, - ExactOutQueryOutput, BALANCER_ROUTER, BALANCER_BATCH_ROUTER, PERMIT2, @@ -57,7 +54,6 @@ describe('SwapV3', () => { let rpcUrl: string; let snapshot: Hex; let pathBalWeth: Path; - let pathBPTBAL: Path; let pathMultiSwap: Path; let pathUsdcWethMulti: Path; let pathWithExit: Path; @@ -83,24 +79,6 @@ describe('SwapV3', () => { outputAmountRaw: 100000000000n, }; - // bpt [swap] weth - pathBPTBAL = { - protocolVersion: 3, - tokens: [ - { - address: '0xce701deAC1B660dA4ee05F6F3F7cbafDDb6a79Fe', //BPT - decimals: 18, - }, - { - address: '0xb19382073c7A0aDdbb56Ac6AF1808Fa49e377B75', - decimals: 18, - }, - ], - pools: ['0xce701deAC1B660dA4ee05F6F3F7cbafDDb6a79Fe'], - inputAmountRaw: 1000000000000000n, - outputAmountRaw: 1n, - }; - // weth [swap] bal [swap] dai [swap] usdc pathMultiSwap = { protocolVersion, @@ -215,194 +193,6 @@ describe('SwapV3', () => { snapshot = await client.snapshot(); }); - // TODO: double check if comparing query outputs against balanceDeltas isn't redundant with query tests - // if yes, we should be able to remove query tests (and avoid relying on a fixed blockNumber) - describe.skip('query method should return correct updated', () => { - describe('single swap', () => { - test('GivenIn', async () => { - const swap = new Swap({ - chainId, - paths: [pathBalWeth], - swapKind: SwapKind.GivenIn, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactInQueryOutput; - - const wethToken = new Token( - chainId, - WETH.address, - WETH.decimals, - ); - expect(expected.expectedAmountOut.token).to.deep.eq(wethToken); - expect(expected.expectedAmountOut.amount).to.eq(97807604n); - }); - test('GivenIn as BPT', async () => { - const swap = new Swap({ - chainId, - paths: [pathBPTBAL], - swapKind: SwapKind.GivenIn, - }); - const expected = (await swap.query( - rpcUrl, - )) as ExactInQueryOutput; - const balToken = new Token(chainId, BAL.address, BAL.decimals); - - expect(expected.expectedAmountOut.token).to.deep.eq(balToken); - expect(expected.expectedAmountOut.amount).to.eq( - 1409169048985584n, - ); - }); - test('GivenOut', async () => { - const swap = new Swap({ - chainId, - paths: [pathBalWeth], - swapKind: SwapKind.GivenOut, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactOutQueryOutput; - - const balToken = new Token(chainId, BAL.address, BAL.decimals); - expect(expected.expectedAmountIn.token).to.deep.eq(balToken); - expect(expected.expectedAmountIn.amount).to.eq( - 102241640811992n, - ); - }); - test('Given Out as BPT', async () => { - const swap = new Swap({ - chainId, - paths: [pathBalWeth], - swapKind: SwapKind.GivenOut, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactOutQueryOutput; - - const balToken = new Token(chainId, BAL.address, BAL.decimals); - - expect(expected.expectedAmountIn.token).to.deep.eq(balToken); - expect(expected.expectedAmountIn.amount).to.eq( - 102241640811992n, - ); - }); - }); - // BAL/DAI pool has no liquidity - describe.skip('multi-hop swap', () => { - describe('path with swaps only', () => { - test('GivenIn', async () => { - const swap = new Swap({ - chainId, - paths: [pathMultiSwap], - swapKind: SwapKind.GivenIn, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactInQueryOutput; - - const usdcToken = new Token( - chainId, - USDC.address, - USDC.decimals, - ); - expect(expected.swapKind).to.eq(SwapKind.GivenIn); - expect(expected.pathAmounts).to.deep.eq([186324n]); - expect(expected.expectedAmountOut.token).to.deep.eq( - usdcToken, - ); - expect(expected.expectedAmountOut.amount).to.eq(186324n); - }); - test('GivenOut', async () => { - const swap = new Swap({ - chainId, - paths: [pathMultiSwap], - swapKind: SwapKind.GivenOut, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactOutQueryOutput; - - const wethToken = new Token( - chainId, - WETH.address, - WETH.decimals, - ); - expect(expected.swapKind).to.eq(SwapKind.GivenOut); - expect(expected.pathAmounts).to.deep.eq([ - 1084111861665514n, - ]); - expect(expected.expectedAmountIn.token).to.deep.eq( - wethToken, - ); - expect(expected.expectedAmountIn.amount).to.eq( - 1084111861665514n, - ); - }); - }); - describe('path with exit', () => { - test('GivenIn', async () => { - const swap = new Swap({ - chainId, - paths: [pathMultiSwap, pathWithExit], - swapKind: SwapKind.GivenIn, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactInQueryOutput; - - const usdcToken = new Token( - chainId, - USDC.address, - USDC.decimals, - ); - expect(expected.swapKind).to.eq(SwapKind.GivenIn); - expect(expected.pathAmounts).to.deep.eq([ - 186324n, - 1181508n, - ]); - expect(expected.expectedAmountOut.token).to.deep.eq( - usdcToken, - ); - expect(expected.expectedAmountOut.amount).to.eq(1367832n); - }); - test('GivenOut', async () => { - const swap = new Swap({ - chainId, - paths: [pathMultiSwap, pathWithExit], - swapKind: SwapKind.GivenOut, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactOutQueryOutput; - - const wethToken = new Token( - chainId, - WETH.address, - WETH.decimals, - ); - expect(expected.swapKind).to.eq(SwapKind.GivenOut); - expect(expected.pathAmounts).to.deep.eq([ - 1084111861665514n, - 519629120486462n, - ]); - expect(expected.expectedAmountIn.token).to.deep.eq( - wethToken, - ); - expect(expected.expectedAmountIn.amount).to.eq( - 1603740982151976n, - ); - }); - }); - }); - }); - describe('permit2 direct approval', () => { beforeEach(async () => { await approveTokens(client, testAddress, tokens, protocolVersion); @@ -518,8 +308,7 @@ describe('SwapV3', () => { }); }); - // BAL/DAI pool has no liquidity - describe.skip('multi-hop swap', () => { + describe('multi-hop swap', () => { describe('swap should be executed correctly', () => { describe('path with swaps only', () => { describe('wethIsEth: false', () => { @@ -812,8 +601,7 @@ describe('SwapV3', () => { }); }); - // BAL/DAI pool has no liquidity - describe.skip('multi-hop swap', () => { + describe('multi-hop swap', () => { describe('swap should be executed correctly', () => { describe('path with swaps only', () => { describe('wethIsEth: false', () => { @@ -986,67 +774,6 @@ describe('SwapV3', () => { isBuffer: [true, false, true], }; - // TODO: same thing about query tests being redundant - describe.skip('query method should return correct updated', () => { - test('GivenIn', async () => { - const swap = new Swap({ - chainId, - paths: [ - { - ...pathWithBuffers, - inputAmountRaw: 100000000n, - outputAmountRaw: 0n, - } as Path, - ], - swapKind: SwapKind.GivenIn, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactInQueryOutput; - - const usdtToken = new Token( - chainId, - USDT.address, - USDT.decimals, - ); - expect(expected.swapKind).to.eq(SwapKind.GivenIn); - expect(expected.pathAmounts).to.deep.eq([99910376n]); - expect(expected.expectedAmountOut.token).to.deep.eq( - usdtToken, - ); - expect(expected.expectedAmountOut.amount).to.eq(99910376n); - }); - test('GivenOut', async () => { - const swap = new Swap({ - chainId, - paths: [ - { - ...pathWithBuffers, - inputAmountRaw: 0n, - outputAmountRaw: 100000000n, - } as Path, - ], - swapKind: SwapKind.GivenOut, - }); - - const expected = (await swap.query( - rpcUrl, - )) as ExactOutQueryOutput; - - const usdcToken = new Token( - chainId, - USDC.address, - USDC.decimals, - ); - expect(expected.swapKind).to.eq(SwapKind.GivenOut); - expect(expected.pathAmounts).to.deep.eq([100089705n]); - expect(expected.expectedAmountIn.token).to.deep.eq( - usdcToken, - ); - expect(expected.expectedAmountIn.amount).to.eq(100089705n); - }); - }); describe('swap should be executed correctly', () => { beforeEach(async () => { await approveTokens( diff --git a/test/lib/utils/addresses.ts b/test/lib/utils/addresses.ts index b1066341..40cf3f13 100644 --- a/test/lib/utils/addresses.ts +++ b/test/lib/utils/addresses.ts @@ -284,8 +284,8 @@ export const POOLS: Record> = { slot: 0, }, MOCK_BAL_DAI_POOL: { - address: '0xe69b70a86a4e1fd33da95693a1ae12be1c26c8ea', // TODO - id: '0xe69b70a86a4e1fd33da95693a1ae12be1c26c8ea', + address: '0x3e099b16beeae7cfcf8a0921941394f1a9b00e0e', + id: '0x3e099b16beeae7cfcf8a0921941394f1a9b00e0e', type: PoolType.Weighted, decimals: 18, slot: 0, From 79c814439991ea6d85ff4303d06c64f76f67adb4 Mon Sep 17 00:00:00 2001 From: Bruno Eidam Guerios Date: Wed, 11 Dec 2024 14:13:10 -0300 Subject: [PATCH 2/2] Add changeset --- .changeset/hungry-dragons-compare.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/hungry-dragons-compare.md diff --git a/.changeset/hungry-dragons-compare.md b/.changeset/hungry-dragons-compare.md new file mode 100644 index 00000000..c229c496 --- /dev/null +++ b/.changeset/hungry-dragons-compare.md @@ -0,0 +1,5 @@ +--- +"@balancer/sdk": patch +--- + +Refactor swaps v3 integration tests