More cleanup

uniswapfoundation · Feb 7, 2024 · 43939fb · 43939fb
1 parent dd8ed28
commit 43939fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/UniStaker.integration.t.sol b/test/UniStaker.integration.t.sol
@@ -47,10 +47,10 @@ contract Propose is ProposalTest {
     (,,,,, uint8 wbtcWethFeeProtocol,) = wbtcWethPool.slot0();
 
     IUniswapPool daiWethPool = IUniswapPool(DAI_WETH_3000_POOL);
-    (,,,,, uint8 daiWethFeeProtocol,) = wbtcWethPool.slot0();
+    (,,,,, uint8 daiWethFeeProtocol,) = daiWethPool.slot0();
 
     IUniswapPool daiUsdcPool = IUniswapPool(DAI_USDC_100_POOL);
-    (,,,,, uint8 daiUsdcFeeProtocol,) = wbtcWethPool.slot0();
+    (,,,,, uint8 daiUsdcFeeProtocol,) = daiUsdcPool.slot0();
 
     assertEq(factory.owner(), address(v3FactoryOwner));
 

diff --git a/test/helpers/ProposalTest.sol b/test/helpers/ProposalTest.sol
@@ -77,22 +77,22 @@ abstract contract ProposalTest is Test, DeployInput, Constants {
     vm.warp(_uniswapProposalEta() + 1); // jump past the eta timestamp
   }
 
-  function _delegatesVoteOnUniswapProposal(bool _support) internal {
+  function _delegatesVoteOnUniswapProposal(uint8 _support) internal {
     for (uint256 _index = 0; _index < delegates.length; _index++) {
       vm.prank(delegates[_index]);
-      governor.castVote(uniswapProposalId, 1);
+      governor.castVote(uniswapProposalId, _support);
     }
   }
 
   function _passUniswapProposal() internal {
     _jumpToActiveUniswapProposal();
-    _delegatesVoteOnUniswapProposal(true);
+    _delegatesVoteOnUniswapProposal(1);
     _jumpToUniswapVoteComplete();
   }
 
   function _defeatUniswapProposal() internal {
     _jumpToActiveUniswapProposal();
-    _delegatesVoteOnUniswapProposal(false);
+    _delegatesVoteOnUniswapProposal(0);
     _jumpToUniswapVoteComplete();
   }