diff --git a/script/DeployLaunch.s.sol b/script/DeployLaunch.s.sol index 03467dd..56da768 100644 --- a/script/DeployLaunch.s.sol +++ b/script/DeployLaunch.s.sol @@ -27,21 +27,12 @@ contract DeployLaunch is DeployLaunchConstants, Script { _executors[0] = address(0x0); vm.startBroadcast(deployer); - _timelock = new TimelockController( - TIMELOCK_MIN_DELAY, - _proposers, - _executors, - deployer - ); + _timelock = new TimelockController(TIMELOCK_MIN_DELAY, _proposers, _executors, deployer); _token = new GuineaPigToken(address(_timelock), INITIAL_MINT_RECEIVER, INITIAL_MINT_AMOUNT); _governor = new GuineaPigGovernor( - _token, - INITIAL_VOTING_DELAY, - INITIAL_VOTING_PERIOD, - INITIAL_PROPOSAL_THRESHOLD, - _timelock + _token, INITIAL_VOTING_DELAY, INITIAL_VOTING_PERIOD, INITIAL_PROPOSAL_THRESHOLD, _timelock ); // Give the Governor the roles it needs to execute & cancel proposals diff --git a/test/GuineaPigGovernor.t.sol b/test/GuineaPigGovernor.t.sol index 5982a94..40fe150 100644 --- a/test/GuineaPigGovernor.t.sol +++ b/test/GuineaPigGovernor.t.sol @@ -16,21 +16,12 @@ contract GuineaPigGovernorTest is Test { uint256 INITIAL_PROPOSAL_THRESHOLD = 100_000e18; function setUp() public { - timelock = new TimelockController( - 100, - new address[](0), - new address[](0), - address(this) - ); + timelock = new TimelockController(100, new address[](0), new address[](0), address(this)); token = new GuineaPigToken(address(timelock), address(0xcafe), 100e18); governor = new GuineaPigGovernor( - token, - INITIAL_VOTING_DELAY, - INITIAL_VOTING_PERIOD, - INITIAL_PROPOSAL_THRESHOLD, - timelock + token, INITIAL_VOTING_DELAY, INITIAL_VOTING_PERIOD, INITIAL_PROPOSAL_THRESHOLD, timelock ); } }