From 6620c8092abbe06325283fcc476ade02d7933720 Mon Sep 17 00:00:00 2001 From: Alien Deployer Date: Fri, 3 Jan 2025 00:12:32 +0300 Subject: [PATCH] refactor constants --- chains/SonicLib.sol | 20 +++++++++---------- ...alancerComposableStableAdapter.Sonic.t.sol | 6 +++--- .../BalancerWeightedAdapter.Sonic.t.sol | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/chains/SonicLib.sol b/chains/SonicLib.sol index a9590b34..0b231171 100644 --- a/chains/SonicLib.sol +++ b/chains/SonicLib.sol @@ -40,10 +40,10 @@ library SonicLib { address public constant TOKEN_scUSD = 0xd3DCe716f3eF535C5Ff8d041c1A41C3bd89b97aE; // AMMs - address public constant POOL_BEETHOVENX_wS_stS = 0x374641076B68371e69D03C417DAc3E5F236c32FA; - address public constant POOL_BEETHOVENX_BEETS_stS = 0x10ac2F9DaE6539E77e372aDB14B1BF8fBD16b3e8; - address public constant POOL_BEETHOVENX_wS_USDC = 0xE93a5fc4Ba77179F6843b30cff33a97d89FF441C; - address public constant POOL_BEETHOVENX_USDC_scUSD = 0xCd4D2b142235D5650fFA6A38787eD0b7d7A51c0C; + address public constant POOL_BEETS_wS_stS = 0x374641076B68371e69D03C417DAc3E5F236c32FA; + address public constant POOL_BEETS_BEETS_stS = 0x10ac2F9DaE6539E77e372aDB14B1BF8fBD16b3e8; + address public constant POOL_BEETS_wS_USDC = 0xE93a5fc4Ba77179F6843b30cff33a97d89FF441C; + address public constant POOL_BEETS_USDC_scUSD = 0xCd4D2b142235D5650fFA6A38787eD0b7d7A51c0C; address public constant POOL_SUSHI_wS_USDC = 0xE72b6DD415cDACeAC76616Df2C9278B33079E0D3; address public constant POOL_EQUALIZER_USDC_WETH = 0xbCbC5777537c0D0462fb82BA48Eeb6cb361E853f; address public constant POOL_EQUALIZER_wS_stS = 0xB75C9073ea00AbDa9ff420b5Ae46fEe248993380; @@ -177,8 +177,8 @@ library SonicLib { //region ----- BC pools ---- bcPools = new ISwapper.AddPoolData[](2); bcPools[0] = - _makePoolData(POOL_BEETHOVENX_wS_stS, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_stS, TOKEN_wS); - // bcPools[1] = _makePoolData(POOL_BEETHOVENX_wS_USDC, AmmAdapterIdLib.BALANCER_WEIGHTED, TOKEN_USDC, TOKEN_wS); + _makePoolData(POOL_BEETS_wS_stS, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_stS, TOKEN_wS); + // bcPools[1] = _makePoolData(POOL_BEETS_wS_USDC, AmmAdapterIdLib.BALANCER_WEIGHTED, TOKEN_USDC, TOKEN_wS); // bcPools[1] = _makePoolData(POOL_SUSHI_wS_USDC, AmmAdapterIdLib.UNISWAPV3, TOKEN_USDC, TOKEN_wS); bcPools[1] = _makePoolData(POOL_EQUALIZER_wS_USDC, AmmAdapterIdLib.SOLIDLY, TOKEN_USDC, TOKEN_wS); //endregion ----- BC pools ---- @@ -187,12 +187,12 @@ library SonicLib { pools = new ISwapper.AddPoolData[](7); uint i; pools[i++] = - _makePoolData(POOL_BEETHOVENX_wS_stS, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_wS, TOKEN_stS); + _makePoolData(POOL_BEETS_wS_stS, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_wS, TOKEN_stS); pools[i++] = - _makePoolData(POOL_BEETHOVENX_wS_stS, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_stS, TOKEN_wS); - pools[i++] = _makePoolData(POOL_BEETHOVENX_BEETS_stS, AmmAdapterIdLib.BALANCER_WEIGHTED, TOKEN_BEETS, TOKEN_stS); + _makePoolData(POOL_BEETS_wS_stS, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_stS, TOKEN_wS); + pools[i++] = _makePoolData(POOL_BEETS_BEETS_stS, AmmAdapterIdLib.BALANCER_WEIGHTED, TOKEN_BEETS, TOKEN_stS); pools[i++] = _makePoolData(POOL_EQUALIZER_wS_USDC, AmmAdapterIdLib.SOLIDLY, TOKEN_USDC, TOKEN_wS); - pools[i++] = _makePoolData(POOL_BEETHOVENX_USDC_scUSD, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_scUSD, TOKEN_USDC); + pools[i++] = _makePoolData(POOL_BEETS_USDC_scUSD, AmmAdapterIdLib.BALANCER_COMPOSABLE_STABLE, TOKEN_scUSD, TOKEN_USDC); pools[i++] = _makePoolData(POOL_EQUALIZER_wS_EQUAL, AmmAdapterIdLib.SOLIDLY, TOKEN_EQUAL, TOKEN_wS); pools[i++] = _makePoolData(POOL_EQUALIZER_USDC_WETH, AmmAdapterIdLib.SOLIDLY, TOKEN_wETH, TOKEN_USDC); //endregion ----- Pools ---- diff --git a/test/adapters/BalancerComposableStableAdapter.Sonic.t.sol b/test/adapters/BalancerComposableStableAdapter.Sonic.t.sol index ca1ba4ab..3371b8a8 100644 --- a/test/adapters/BalancerComposableStableAdapter.Sonic.t.sol +++ b/test/adapters/BalancerComposableStableAdapter.Sonic.t.sol @@ -19,7 +19,7 @@ contract BalancerComposableStableAdapterTest is SonicSetup { vm.expectRevert(IControllable.AlreadyExist.selector); balancerAdapter.setupHelpers(address(1)); - address pool = SonicLib.POOL_BEETHOVENX_wS_stS; + address pool = SonicLib.POOL_BEETS_wS_stS; uint[] memory amounts = new uint[](2); amounts[0] = 1e18; amounts[1] = 100e18; @@ -33,7 +33,7 @@ contract BalancerComposableStableAdapterTest is SonicSetup { } function testSwaps() public { - address pool = SonicLib.POOL_BEETHOVENX_wS_stS; + address pool = SonicLib.POOL_BEETS_wS_stS; deal(SonicLib.TOKEN_wS, address(adapter), 1e16); adapter.swap(pool, SonicLib.TOKEN_wS, SonicLib.TOKEN_stS, address(this), 10_000); uint out = IERC20(SonicLib.TOKEN_stS).balanceOf(address(this)); @@ -49,7 +49,7 @@ contract BalancerComposableStableAdapterTest is SonicSetup { function testViewMethods() public view { assertEq(keccak256(bytes(adapter.ammAdapterId())), _hash); - address pool = SonicLib.POOL_BEETHOVENX_wS_stS; + address pool = SonicLib.POOL_BEETS_wS_stS; uint price; price = adapter.getPrice(pool, SonicLib.TOKEN_stS, SonicLib.TOKEN_wS, 1e10); assertGt(price, 9e9); diff --git a/test/adapters/BalancerWeightedAdapter.Sonic.t.sol b/test/adapters/BalancerWeightedAdapter.Sonic.t.sol index fb7e0b57..52d0fef6 100644 --- a/test/adapters/BalancerWeightedAdapter.Sonic.t.sol +++ b/test/adapters/BalancerWeightedAdapter.Sonic.t.sol @@ -19,7 +19,7 @@ contract BalancerWeightedAdapterTest is SonicSetup { vm.expectRevert(IControllable.AlreadyExist.selector); balancerAdapter.setupHelpers(address(1)); - address pool = SonicLib.POOL_BEETHOVENX_BEETS_stS; + address pool = SonicLib.POOL_BEETS_BEETS_stS; uint[] memory amounts = new uint[](2); amounts[0] = 1e18; amounts[1] = 100e18; @@ -33,7 +33,7 @@ contract BalancerWeightedAdapterTest is SonicSetup { } function testSwaps() public { - address pool = SonicLib.POOL_BEETHOVENX_BEETS_stS; + address pool = SonicLib.POOL_BEETS_BEETS_stS; deal(SonicLib.TOKEN_stS, address(adapter), 1e15); adapter.swap(pool, SonicLib.TOKEN_stS, SonicLib.TOKEN_BEETS, address(this), 10_000); uint out = IERC20(SonicLib.TOKEN_BEETS).balanceOf(address(this)); @@ -49,7 +49,7 @@ contract BalancerWeightedAdapterTest is SonicSetup { function testViewMethods() public view { assertEq(keccak256(bytes(adapter.ammAdapterId())), _hash); - address pool = SonicLib.POOL_BEETHOVENX_BEETS_stS; + address pool = SonicLib.POOL_BEETS_BEETS_stS; address[] memory tokens = adapter.poolTokens(pool); assertEq(tokens.length, 2); assertEq(tokens[0], SonicLib.TOKEN_BEETS);