Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor: allocation tests #520

Merged
merged 6 commits into from
Feb 1, 2023
Merged

Refactor: allocation tests #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dddb31c
refactor: staking-router allocation tests
mymphe Jan 31, 2023
7edea5a
refactor: minfirst library tests
mymphe Jan 31, 2023
1797cfb
refactor: move to common tests
mymphe Jan 31, 2023
79af0a3
fix: set timeouts
mymphe Jan 31, 2023
60dd328
Merge branch 'feature/shapella-upgrade' into refactor/allocation-tests
arwer13 Jan 31, 2023
6c770c0
test: reflect math lib updates
mymphe Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...elpers/MinFirstAllocationStrategyTest.sol → ...tionStrategyConsumerMockModernVersion.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 5 additions & 1 deletion contracts/0.8.9/test_helpers/StakingRouterMock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions dao-devnet3-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
Loading