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

use onchain proposal in tests #28

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

use onchain proposal in tests #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24147a8
fix flaky test
wildmolasses Sep 23, 2024
30e16df
use onchain proposal
wildmolasses Sep 27, 2024
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
3 changes: 3 additions & 0 deletions test/RadworksGovernor.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ abstract contract Propose is ProposalTest {
// RAD_TOKEN handled specially as bravo upgrade changes RAD token balances
IERC20 _token = IERC20(RAD_TOKEN);
_assumeReceiver(_receiver);
vm.assume(_receiver != SCOPELIFT_ADDRESS);
uint256 _timelockTokenBalance = _token.balanceOf(TIMELOCK);

// bound by the number of tokens the timelock currently controls
Expand Down Expand Up @@ -232,6 +233,7 @@ abstract contract Propose is ProposalTest {
// @dev: RAD_TOKEN handled specially as bravo upgrade changes RAD token balances
IERC20 _token = IERC20(RAD_TOKEN);
_assumeReceiver(_receiver);
vm.assume(_receiver != SCOPELIFT_ADDRESS);

vm.deal(TIMELOCK, _amountETH);
uint256 _timelockETHBalance = TIMELOCK.balance;
Expand Down Expand Up @@ -453,6 +455,7 @@ abstract contract Propose is ProposalTest {
// @dev: RAD_TOKEN handled specially as bravo upgrade changes RAD token balances
IERC20 _token = IERC20(RAD_TOKEN);
_assumeReceiver(_receiver);
vm.assume(_receiver != SCOPELIFT_ADDRESS);
uint256 _timelockTokenBalance = _token.balanceOf(TIMELOCK);

// bound by the number of tokens the timelock currently controls
Expand Down
13 changes: 11 additions & 2 deletions test/helpers/ProposalTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,17 @@ abstract contract ProposalTest is RadworksGovernorTest {
function setUp() public virtual override {
RadworksGovernorTest.setUp();
initialProposalCount = governorAlpha.proposalCount();
TestableProposeScript _proposeScript = new TestableProposeScript();
upgradeProposalId = _proposeScript.run(governorBravo);
if (_useDeployedGovernorBravo()) {
// Use the actual live proposal data
upgradeProposalId = 25;
// Since the proposal was already submitted, the count before its submission is one less
initialProposalCount = governorAlpha.proposalCount() - 1;
} else {
initialProposalCount = governorAlpha.proposalCount();

TestableProposeScript _proposeScript = new TestableProposeScript();
upgradeProposalId = _proposeScript.run(governorBravo);
}
}

//--------------- HELPERS ---------------//
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/RadworksGovernorTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ abstract contract RadworksGovernorTest is Test, DeployInput, Constants {
function setUp() public virtual {
// The latest block when this test was written. If you update the fork block
// make sure to also update the top 6 delegates below.
uint256 _forkBlock = 20_341_999;
uint256 _forkBlock = 20_826_606;

vm.createSelectFork(vm.rpcUrl("mainnet"), _forkBlock);

Expand Down
Loading