From c16b9c01e5abe7d64cfa834de3f60b95b108bf2a Mon Sep 17 00:00:00 2001 From: Keating Date: Tue, 13 Feb 2024 20:28:15 -0500 Subject: [PATCH] Some clean up --- test/UniStaker.integration.t.sol | 3 --- test/helpers/ProposalTest.sol | 8 -------- 2 files changed, 11 deletions(-) diff --git a/test/UniStaker.integration.t.sol b/test/UniStaker.integration.t.sol index d2be2d3..7b370f1 100644 --- a/test/UniStaker.integration.t.sol +++ b/test/UniStaker.integration.t.sol @@ -48,9 +48,6 @@ contract Propose is ProposalTest { IUniswapPool daiUsdcPool = IUniswapPool(DAI_USDC_100_POOL); (,,,,, uint8 oldDaiUsdcFeeProtocol,) = daiUsdcPool.slot0(); - // _passAndQueueProposals(); - // _executeProposal(setOwnerProposalId); - // _executeProposal(setFeeProposalId); _passAndQueueProposals(); (,,,,, uint8 newWbtcWethFeeProtocol,) = wbtcWethPool.slot0(); diff --git a/test/helpers/ProposalTest.sol b/test/helpers/ProposalTest.sol index 7927674..5e7f665 100644 --- a/test/helpers/ProposalTest.sol +++ b/test/helpers/ProposalTest.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.23; import {Test} from "forge-std/Test.sol"; -import {console2} from "forge-std/console2.sol"; import {Deploy} from "script/Deploy.s.sol"; import {DeployInput} from "script/DeployInput.sol"; @@ -116,13 +115,6 @@ abstract contract ProposalTest is Test, DeployInput, Constants { _jumpToVoteComplete(setOwnerProposalId); } - //function _defeatUniswapProposal() internal { - // _jumpToActiveProposal(setFeeProposalId); - // _delegatesVoteOnUniswapProposal(setOwnerProposalId, uint8(VoteType.Against)); - // _delegatesVoteOnUniswapProposal(setFeeProposalId, uint8(VoteType.Against)); - // _jumpToVoteComplete(setFeeProposalId); - //} - function _passAndQueueProposals() internal { _passNewFactoryOwnerProposal(); governor.queue(setOwnerProposalId);