Merge pull request #520 from lidofinance/refactor/allocation-tests

Refactor: allocation tests
lidofinance · Feb 1, 2023 · 8273d02 · 8273d02
2 parents 44ee896 + 6c770c0
commit 8273d02
Show file tree

Hide file tree

Showing 7 changed files with 500 additions and 854 deletions.
diff --git a/...elpers/MinFirstAllocationStrategyTest.sol → ...tionStrategyConsumerMockModernVersion.sol b/...elpers/MinFirstAllocationStrategyTest.sol → ...tionStrategyConsumerMockModernVersion.sol
@@ -6,7 +6,7 @@ pragma solidity 0.8.9;
 
 import {MinFirstAllocationStrategy} from "../../common/lib/MinFirstAllocationStrategy.sol";
 
-contract MinFirstAllocationStrategyTest {
+contract MinFirstAllocationStrategyConsumerMockModernVersion {
     function allocate(
         uint256[] memory allocations,
         uint256[] memory capacities,

diff --git a/contracts/0.8.9/test_helpers/StakingRouterMock.sol b/contracts/0.8.9/test_helpers/StakingRouterMock.sol
@@ -13,6 +13,10 @@ contract StakingRouterMock is StakingRouter {
     }
 
     function getStakingModuleIndexById(uint256 _stakingModuleId) external view returns (uint256) {
-        return _getStakingModuleIndexById(uint24(_stakingModuleId));
+        return _getStakingModuleIndexById(_stakingModuleId);
+    }
+
+    function getStakingModuleByIndex(uint256 _stakingModuleId) external view returns (StakingModule memory) {
+        return _getStakingModuleByIndex(_stakingModuleId);
     }
 }
diff --git a/dao-devnet3-deploy.sh b/dao-devnet3-deploy.sh
@@ -93,7 +93,7 @@ mv contracts/common/lib/MinFirstAllocationStrategy.sol contracts/common/lib/MinF
 mv contracts/common/lib/MinFirstAllocationStrategy.sol.4 contracts/common/lib/MinFirstAllocationStrategy.sol
 mv contracts/0.8.9/StakingRouter.sol contracts/0.8.9/StakingRouter.sol.bkp
 mv contracts/0.8.9/test_helpers/StakingRouterMock.sol contracts/0.8.9/test_helpers/StakingRouterMock.sol.bkp
-mv contracts/0.8.9/test_helpers/MinFirstAllocationStrategyTest.sol contracts/0.8.9/test_helpers/MinFirstAllocationStrategyTest.sol.bkp
+mv contracts/0.8.9/test_helpers/MinFirstAllocationStrategyConsumerMockModernVersion.sol contracts/0.8.9/test_helpers/MinFirstAllocationStrategyConsumerMockModernVersion.sol.bkp
 
 yarn hardhat --network $NETWORK run ./scripts/multisig/04-publish-app-frontends.js
 msg "Frontend published to IPFS"
@@ -102,7 +102,7 @@ mv contracts/common/lib/MinFirstAllocationStrategy.sol contracts/common/lib/MinF
 mv contracts/common/lib/MinFirstAllocationStrategy.sol.48 contracts/common/lib/MinFirstAllocationStrategy.sol
 mv contracts/0.8.9/StakingRouter.sol.bkp contracts/0.8.9/StakingRouter.sol
 mv contracts/0.8.9/test_helpers/StakingRouterMock.sol.bkp contracts/0.8.9/test_helpers/StakingRouterMock.sol
-mv contracts/0.8.9/test_helpers/MinFirstAllocationStrategyTest.sol.bkp contracts/0.8.9/test_helpers/MinFirstAllocationStrategyTest.sol
+mv contracts/0.8.9/test_helpers/MinFirstAllocationStrategyConsumerMockModernVersion.sol.bkp contracts/0.8.9/test_helpers/MinFirstAllocationStrategyConsumerMockModernVersion.sol
 
 yarn hardhat --network $NETWORK run ./scripts/multisig/05-deploy-apm.js
 yarn hardhat --network $NETWORK tx --from $DEPLOYER --file tx-03-deploy-apm.json