From 71aed4ab83fd2f090c14f4f23d650a8f1cceceec Mon Sep 17 00:00:00 2001 From: bronco Date: Thu, 31 Aug 2023 16:27:45 +0200 Subject: [PATCH] fix: should fetch data for all linear pools --- .../src/modules/data/pool/onchain-data.ts | 7 +- .../exits.module.integration-mainnet.spec.ts | 6 +- .../exits/exits.module.integration.spec.ts | 4 +- ...itsProportional.module.integration.spec.ts | 4 +- .../joins/joins.module.integration.spec.ts | 95 +++++++++---------- 5 files changed, 55 insertions(+), 61 deletions(-) diff --git a/balancer-js/src/modules/data/pool/onchain-data.ts b/balancer-js/src/modules/data/pool/onchain-data.ts index f1dd995d4..628db0598 100644 --- a/balancer-js/src/modules/data/pool/onchain-data.ts +++ b/balancer-js/src/modules/data/pool/onchain-data.ts @@ -122,13 +122,10 @@ const poolTypeCalls = (poolType: string, poolTypeVersion = 1) => { } else { return do_nothing; } - case 'AaveLinear': - if (poolTypeVersion === 1) { + default: + if (poolType.includes('Linear')) { return linearCalls; - } else { - return do_nothing; } - default: return do_nothing; } }; diff --git a/balancer-js/src/modules/exits/exits.module.integration-mainnet.spec.ts b/balancer-js/src/modules/exits/exits.module.integration-mainnet.spec.ts index d278254d5..18e96277d 100644 --- a/balancer-js/src/modules/exits/exits.module.integration-mainnet.spec.ts +++ b/balancer-js/src/modules/exits/exits.module.integration-mainnet.spec.ts @@ -45,7 +45,7 @@ describe('generalised exit execution', async function () { }); }); - context.skip('ERC4626 - bbausd3', async () => { + context('ERC4626 - bbausd3', async () => { if (!TEST_BBAUSD3) return true; const network = Network.MAINNET; const pool = ADDRESSES[network].bbausd3; @@ -113,7 +113,7 @@ describe('generalised exit execution', async function () { }); }); - context.skip('GearboxLinear - bbgusd', async () => { + context('GearboxLinear - bbgusd', async () => { const network = Network.MAINNET; const pool = ADDRESSES[network].bbgusd; const slippage = '10'; // 10 bps = 0.1% @@ -180,7 +180,7 @@ describe('generalised exit execution', async function () { }); }); - context.skip('AaveLinear - bbausd2', async () => { + context('AaveLinear - bbausd2', async () => { const network = Network.MAINNET; const pool = ADDRESSES[network].bbausd2; const slippage = '10'; // 10 bps = 0.1% diff --git a/balancer-js/src/modules/exits/exits.module.integration.spec.ts b/balancer-js/src/modules/exits/exits.module.integration.spec.ts index 00f374afa..bd35a25c9 100644 --- a/balancer-js/src/modules/exits/exits.module.integration.spec.ts +++ b/balancer-js/src/modules/exits/exits.module.integration.spec.ts @@ -25,7 +25,7 @@ const poolAddresses = Object.values(ADDRESSES[network]).map( ); const addresses = ADDRESSES[network]; -describe.skip('generalised exit execution', async function () { +describe('generalised exit execution', async function () { this.timeout(120000); // Sets timeout for all tests within this scope to 2 minutes /* @@ -224,7 +224,7 @@ describe.skip('generalised exit execution', async function () { b-a-weth: Linear, aWeth/Weth b-a-usd2: ComposableStable, b-a-usdt/b-a-usdc/b-a-dai */ - context.skip('boostedWeightedMetaGeneral', async () => { + context('boostedWeightedMetaGeneral', async () => { if (!TEST_BOOSTED_WEIGHTED_META_GENERAL) return true; const pool = addresses.boostedWeightedMetaGeneral1; const amount = parseFixed('0.05', pool.decimals).toString(); diff --git a/balancer-js/src/modules/exits/exitsProportional.module.integration.spec.ts b/balancer-js/src/modules/exits/exitsProportional.module.integration.spec.ts index 501616476..e37bf72d8 100644 --- a/balancer-js/src/modules/exits/exitsProportional.module.integration.spec.ts +++ b/balancer-js/src/modules/exits/exitsProportional.module.integration.spec.ts @@ -53,7 +53,7 @@ describe('generalised exit execution', async () => { }, ]); }); - context.skip('composable stable pool - boosted', async () => { + context('composable stable pool - boosted', async () => { const testPool = addresses.bbgusd; await runTests([ { @@ -67,7 +67,7 @@ describe('generalised exit execution', async () => { }, ]); }); - context.skip('weighted with boosted', async () => { + context('weighted with boosted', async () => { const testPool = addresses.STG_BBAUSD; await runTests([ { diff --git a/balancer-js/src/modules/joins/joins.module.integration.spec.ts b/balancer-js/src/modules/joins/joins.module.integration.spec.ts index cc3223c8b..c30ba558f 100644 --- a/balancer-js/src/modules/joins/joins.module.integration.spec.ts +++ b/balancer-js/src/modules/joins/joins.module.integration.spec.ts @@ -105,55 +105,52 @@ describe('generalised join execution', async function () { }); }); - context.skip( - 'join with wETH vs ETH - where first step is a swap', - async () => { - if (!TEST_JOIN_WITH_ETH_SWAP_FIRST) return true; - - before(async () => { - testPool = addresses.swEth_bbaweth; - tokens = [addresses.WETH, addresses.swETH]; - balances = [ - parseFixed('10', addresses.WETH.decimals).toString(), - parseFixed('10', addresses.swETH.decimals).toString(), - ]; - }); - - it('should join with wETH', async () => { - const tokensIn = [addresses.WETH.address, addresses.swETH.address]; - const amountsIn = [ - parseFixed('1', addresses.WETH.decimals).toString(), - parseFixed('1', addresses.swETH.decimals).toString(), - ]; - await testGeneralisedJoin( - sdk, - signer, - userAddress, - testPool, - tokensIn, - amountsIn, - simulationType - ); - }); - - it('should join with ETH', async () => { - const tokensIn = [AddressZero, addresses.swETH.address]; - const amountsIn = [ - parseFixed('1', 18).toString(), - parseFixed('1', addresses.swETH.decimals).toString(), - ]; - await testGeneralisedJoin( - sdk, - signer, - userAddress, - testPool, - tokensIn, - amountsIn, - simulationType - ); - }); - } - ); + context('join with wETH vs ETH - where first step is a swap', async () => { + if (!TEST_JOIN_WITH_ETH_SWAP_FIRST) return true; + + before(async () => { + testPool = addresses.swEth_bbaweth; + tokens = [addresses.WETH, addresses.swETH]; + balances = [ + parseFixed('10', addresses.WETH.decimals).toString(), + parseFixed('10', addresses.swETH.decimals).toString(), + ]; + }); + + it('should join with wETH', async () => { + const tokensIn = [addresses.WETH.address, addresses.swETH.address]; + const amountsIn = [ + parseFixed('1', addresses.WETH.decimals).toString(), + parseFixed('1', addresses.swETH.decimals).toString(), + ]; + await testGeneralisedJoin( + sdk, + signer, + userAddress, + testPool, + tokensIn, + amountsIn, + simulationType + ); + }); + + it('should join with ETH', async () => { + const tokensIn = [AddressZero, addresses.swETH.address]; + const amountsIn = [ + parseFixed('1', 18).toString(), + parseFixed('1', addresses.swETH.decimals).toString(), + ]; + await testGeneralisedJoin( + sdk, + signer, + userAddress, + testPool, + tokensIn, + amountsIn, + simulationType + ); + }); + }); context('join with wETH vs ETH - where first step is a join', async () => { if (!TEST_JOIN_WITH_ETH_JOIN_FIRST) return true;