test: Update tests to use to field.

balancer · Nov 1, 2024 · 3bac32c · 3bac32c
1 parent 2e5cb11
commit 3bac32c
Show file tree

Hide file tree

Showing 23 changed files with 130 additions and 2 deletions.
diff --git a/test/cowAmm/addLiquidity.integration.test.ts b/test/cowAmm/addLiquidity.integration.test.ts
@@ -122,6 +122,7 @@ describe('add liquidity test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 protocolVersion,
             );
         });

diff --git a/test/cowAmm/removeLiquidity.integration.test.ts b/test/cowAmm/removeLiquidity.integration.test.ts
@@ -154,6 +154,7 @@ describe('remove liquidity test', () => {
                 input,
                 removeLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 protocolVersion,
             );
         });

diff --git a/test/lib/utils/addLiquidityHelper.ts b/test/lib/utils/addLiquidityHelper.ts
@@ -18,6 +18,7 @@ import {
     VAULT,
     Permit2Helper,
     AddLiquidityKind,
+    ChainId,
 } from 'src';
 import { getTokensForBalanceCheck } from './getTokensForBalanceCheck';
 import { TxOutput, sendTransactionGetBalances } from './helper';
@@ -188,6 +189,7 @@ export function assertAddLiquidityUnbalanced(
     addLiquidityInput: AddLiquidityUnbalancedInput,
     addLiquidityOutput: AddLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -214,6 +216,7 @@ export function assertAddLiquidityUnbalanced(
     > = {
         // | Omit<AddLiquidityV2BaseQueryOutput, 'amountsIn' | 'bptIndex'> = {
         // Query should use same amountsIn as input
+        to: protocolVersion === 2 ? VAULT[chainId] : BALANCER_ROUTER[chainId],
         amountsIn: expectedAmountsIn,
         tokenInIndex: undefined,
         // Should match inputs
@@ -256,6 +259,7 @@ export function assertAddLiquiditySingleToken(
     addLiquidityInput: AddLiquiditySingleTokenInput,
     addLiquidityOutput: AddLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -280,6 +284,7 @@ export function assertAddLiquiditySingleToken(
         'amountsIn' | 'bptIndex'
     > = {
         // Query should use same bpt out as user sets
+        to: protocolVersion === 2 ? VAULT[chainId] : BALANCER_ROUTER[chainId],
         bptOut: TokenAmount.fromRawAmount(
             bptToken,
             addLiquidityInput.bptOut.rawAmount,
@@ -334,6 +339,7 @@ export function assertAddLiquidityProportional(
     addLiquidityInput: AddLiquidityProportionalInput,
     addLiquidityOutput: AddLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 1 | 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -360,7 +366,24 @@ export function assertAddLiquidityProportional(
                 : a,
     );
 
+    let to: Address;
+
+    switch (protocolVersion) {
+        case 1:
+            to = poolState.address;
+            break;
+        case 2:
+            to = VAULT[chainId];
+            break;
+        case 3:
+            to = BALANCER_ROUTER[chainId];
+            break;
+        default:
+            throw new Error(`Unsupported protocolVersion: ${protocolVersion}`);
+    }
+
     const expectedQueryOutput: Omit<AddLiquidityQueryOutput, 'bptIndex'> = {
+        to,
         // Query should use same referenceAmount as user sets
         bptOut,
         amountsIn,

diff --git a/test/lib/utils/removeLiquidityHelper.ts b/test/lib/utils/removeLiquidityHelper.ts
@@ -19,6 +19,7 @@ import {
     TokenAmount,
     VAULT,
     PermitHelper,
+    ChainId,
 } from 'src';
 import { getTokensForBalanceCheck } from './getTokensForBalanceCheck';
 import { sendTransactionGetBalances, TxOutput } from './helper';
@@ -184,6 +185,7 @@ export function assertRemoveLiquidityUnbalanced(
     removeLiquidityInput: RemoveLiquidityUnbalancedInput,
     removeLiquidityOutput: RemoveLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     wethIsEth?: boolean,
 ) {
     const {
@@ -211,6 +213,7 @@ export function assertRemoveLiquidityUnbalanced(
         'bptIn' | 'bptIndex'
     > = {
         // Query should use same amountsOut as input
+        to: VAULT[chainId],
         amountsOut: expectedAmountsOut,
         tokenOutIndex: undefined,
         // Should match inputs
@@ -249,6 +252,7 @@ export function assertRemoveLiquiditySingleTokenExactOut(
     removeLiquidityInput: RemoveLiquiditySingleTokenExactOutInput,
     removeLiquidityOutput: RemoveLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -281,6 +285,7 @@ export function assertRemoveLiquiditySingleTokenExactOut(
         'bptIn' | 'bptIndex'
     > = {
         // Query should use same amountsOut as input
+        to: protocolVersion === 2 ? VAULT[chainId] : BALANCER_ROUTER[chainId],
         amountsOut: expectedAmountsOut,
         tokenOutIndex: tokensWithoutBpt.findIndex(
             (t) => t.address === removeLiquidityInput.amountOut.address,
@@ -322,6 +327,7 @@ export function assertRemoveLiquiditySingleTokenExactIn(
     removeLiquidityInput: RemoveLiquiditySingleTokenExactInInput,
     removeLiquidityOutput: RemoveLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -349,6 +355,7 @@ export function assertRemoveLiquiditySingleTokenExactIn(
         'amountsOut' | 'bptIndex'
     > = {
         // Query should use same bpt out as user sets
+        to: protocolVersion === 2 ? VAULT[chainId] : BALANCER_ROUTER[chainId],
         bptIn: TokenAmount.fromRawAmount(
             bptToken,
             removeLiquidityInput.bptIn.rawAmount,
@@ -406,6 +413,7 @@ export function assertRemoveLiquidityProportional(
     removeLiquidityInput: RemoveLiquidityProportionalInput,
     removeLiquidityOutput: RemoveLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 1 | 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -421,6 +429,22 @@ export function assertRemoveLiquidityProportional(
         18,
     );
 
+    let to: Address;
+
+    switch (protocolVersion) {
+        case 1:
+            to = poolState.address;
+            break;
+        case 2:
+            to = VAULT[chainId];
+            break;
+        case 3:
+            to = BALANCER_ROUTER[chainId];
+            break;
+        default:
+            throw new Error(`Unsupported protocolVersion: ${protocolVersion}`);
+    }
+
     const expectedQueryOutput: Omit<
         RemoveLiquidityQueryOutput,
         'amountsOut' | 'bptIndex'
@@ -438,6 +462,7 @@ export function assertRemoveLiquidityProportional(
         removeLiquidityKind: removeLiquidityInput.kind,
         protocolVersion: poolState.protocolVersion,
         chainId: removeLiquidityInput.chainId,
+        to,
     };
 
     const queryCheck = getCheck(removeLiquidityQueryOutput, true);

diff --git a/test/lib/utils/removeLiquidityRecoveryHelper.ts b/test/lib/utils/removeLiquidityRecoveryHelper.ts
@@ -1,4 +1,6 @@
 import {
+    BALANCER_ROUTER,
+    ChainId,
     NATIVE_ASSETS,
     PoolState,
     RemoveLiquidityBuildCallInput,
@@ -8,6 +10,7 @@ import {
     Slippage,
     Token,
     TokenAmount,
+    VAULT,
 } from 'src';
 import { getTokensForBalanceCheck } from './getTokensForBalanceCheck';
 import { sendTransactionGetBalances } from './helper';
@@ -120,6 +123,7 @@ export function assertRemoveLiquidityRecovery(
     removeLiquidityRecoveryInput: RemoveLiquidityRecoveryInput,
     removeLiquidityOutput: RemoveLiquidityOutput,
     slippage: Slippage,
+    chainId: ChainId,
     protocolVersion: 2 | 3 = 2,
     wethIsEth?: boolean,
 ) {
@@ -152,6 +156,7 @@ export function assertRemoveLiquidityRecovery(
         removeLiquidityKind: removeLiquidityRecoveryInput.kind,
         protocolVersion: poolState.protocolVersion,
         chainId: removeLiquidityRecoveryInput.chainId,
+        to: protocolVersion === 2 ? VAULT[chainId] : BALANCER_ROUTER[chainId],
     };
 
     const queryCheck = getCheck(removeLiquidityQueryOutput, true);

diff --git a/test/v2/addLiquidity/composableStable.integration.test.ts b/test/v2/addLiquidity/composableStable.integration.test.ts
@@ -121,6 +121,7 @@ describe('add liquidity composable stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
 
@@ -140,6 +141,7 @@ describe('add liquidity composable stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );
@@ -174,6 +176,7 @@ describe('add liquidity composable stable test', () => {
                 input,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
 
@@ -193,6 +196,7 @@ describe('add liquidity composable stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );
@@ -225,6 +229,7 @@ describe('add liquidity composable stable test', () => {
                 input,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
         test('with native', async () => {
@@ -242,6 +247,7 @@ describe('add liquidity composable stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );

diff --git a/test/v2/addLiquidity/gyro2.integration.test.ts b/test/v2/addLiquidity/gyro2.integration.test.ts
@@ -116,6 +116,7 @@ describe('Gyro2 add liquidity test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
         //Removed test with native, because there are no GyroE V1 pool with wrapped native asset in any network

diff --git a/test/v2/addLiquidity/gyro3.integration.test.ts b/test/v2/addLiquidity/gyro3.integration.test.ts
@@ -116,6 +116,7 @@ describe('Gyro3 add liquidity test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
         //Removed test with native, because there are no GyroE V1 pool with wrapped native asset in any network

diff --git a/test/v2/addLiquidity/gyroE.integration.test.ts b/test/v2/addLiquidity/gyroE.integration.test.ts
@@ -116,6 +116,7 @@ describe('gyroE V2 add liquidity test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
     });

diff --git a/test/v2/addLiquidity/gyroEV2.integration.test.ts b/test/v2/addLiquidity/gyroEV2.integration.test.ts
@@ -116,6 +116,7 @@ describe('GyroE V2 add liquidity test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
         test('with native', async () => {
@@ -130,6 +131,7 @@ describe('GyroE V2 add liquidity test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );

diff --git a/test/v2/addLiquidity/stable.integration.test.ts b/test/v2/addLiquidity/stable.integration.test.ts
@@ -116,6 +116,7 @@ describe('add liquidity stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
 
@@ -135,6 +136,7 @@ describe('add liquidity stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 poolState.protocolVersion,
                 wethIsEth,
             );
@@ -170,6 +172,7 @@ describe('add liquidity stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
 
@@ -186,6 +189,7 @@ describe('add liquidity stable test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 poolState.protocolVersion,
                 wethIsEth,
             );

diff --git a/test/v2/addLiquidity/weighted.integration.test.ts b/test/v2/addLiquidity/weighted.integration.test.ts
@@ -121,6 +121,7 @@ describe('add liquidity weighted test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
 
@@ -140,6 +141,7 @@ describe('add liquidity weighted test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );
@@ -175,6 +177,7 @@ describe('add liquidity weighted test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
 
@@ -191,6 +194,7 @@ describe('add liquidity weighted test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );
@@ -223,6 +227,7 @@ describe('add liquidity weighted test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
             );
         });
         test('with native', async () => {
@@ -238,6 +243,7 @@ describe('add liquidity weighted test', () => {
                 addLiquidityInput,
                 addLiquidityOutput,
                 txInput.slippage,
+                chainId,
                 2,
                 wethIsEth,
             );