test updates (#932)

* fix fork tests

* allow fork cheatcodes

* pr feedback yee

* woohoo

---------

Co-authored-by: Alice Henshaw <henshawalice@gmail.com>
Co-authored-by: saucepoint <saucepoint@protonmail.com>
Co-authored-by: dianakocsis <diana.kocsis@uniswap.org>

Author: 4 people

snapshots/PoolManagerTest.json

@@ -3,8 +3,8 @@
   "addLiquidity with native token": "135001",
   "donate gas with 1 token": "106214",
   "donate gas with 2 tokens": "145510",
-  "erc20 collect protocol fees": "57500",
-  "native collect protocol fees": "59643",
+  "erc20 collect protocol fees": "57728",
+  "native collect protocol fees": "59371",
   "poolManager bytecode size": "24009",
   "poolManager initcode hash (without constructor params, as uint256)": "19281018184167079101887460999643277467915809731640262058315305465805214934776",
   "removeLiquidity with empty hook": "130613",

test/PoolManager.t.sol

@@ -73,6 +73,8 @@ contract PoolManagerTest is Test, Deployers {
 
     uint24 constant MAX_PROTOCOL_FEE_BOTH_TOKENS = (1000 << 12) | 1000; // 1000 1000
 
+    address recipientAddress = makeAddr("recipientAddress");
+
     function setUp() public {
         initializeManagerRoutersAndPoolsWithLiq(IHooks(address(0)));
 
@@ -1057,11 +1059,11 @@ contract PoolManagerTest is Test, Deployers {
 
         assertEq(manager.protocolFeesAccrued(currency0), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency1), 0);
-        assertEq(currency0.balanceOf(address(1)), 0);
+        assertEq(currency0.balanceOf(recipientAddress), 0);
         vm.prank(feeController);
-        manager.collectProtocolFees(address(1), currency0, expectedFees);
+        manager.collectProtocolFees(recipientAddress, currency0, expectedFees);
         vm.snapshotGasLastCall("erc20 collect protocol fees");
-        assertEq(currency0.balanceOf(address(1)), expectedFees);
+        assertEq(currency0.balanceOf(recipientAddress), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency0), 0);
     }
 
@@ -1086,10 +1088,10 @@ contract PoolManagerTest is Test, Deployers {
 
         assertEq(manager.protocolFeesAccrued(currency0), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency1), 0);
-        assertEq(currency0.balanceOf(address(1)), 0);
+        assertEq(currency0.balanceOf(recipientAddress), 0);
         vm.prank(feeController);
-        manager.collectProtocolFees(address(1), currency0, expectedFees);
-        assertEq(currency0.balanceOf(address(1)), expectedFees);
+        manager.collectProtocolFees(recipientAddress, currency0, expectedFees);
+        assertEq(currency0.balanceOf(recipientAddress), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency0), 0);
     }
 
@@ -1114,10 +1116,10 @@ contract PoolManagerTest is Test, Deployers {
 
         assertEq(manager.protocolFeesAccrued(currency0), 0);
         assertEq(manager.protocolFeesAccrued(currency1), expectedFees);
-        assertEq(currency1.balanceOf(address(1)), 0);
+        assertEq(currency1.balanceOf(recipientAddress), 0);
         vm.prank(feeController);
-        manager.collectProtocolFees(address(1), currency1, 0);
-        assertEq(currency1.balanceOf(address(1)), expectedFees);
+        manager.collectProtocolFees(recipientAddress, currency1, 0);
+        assertEq(currency1.balanceOf(recipientAddress), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency1), 0);
     }
 
@@ -1143,11 +1145,11 @@ contract PoolManagerTest is Test, Deployers {
 
         assertEq(manager.protocolFeesAccrued(nativeCurrency), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency1), 0);
-        assertEq(nativeCurrency.balanceOf(address(1)), 0);
+        assertEq(nativeCurrency.balanceOf(recipientAddress), 0);
         vm.prank(feeController);
-        manager.collectProtocolFees(address(1), nativeCurrency, expectedFees);
+        manager.collectProtocolFees(recipientAddress, nativeCurrency, expectedFees);
         vm.snapshotGasLastCall("native collect protocol fees");
-        assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
+        assertEq(nativeCurrency.balanceOf(recipientAddress), expectedFees);
         assertEq(manager.protocolFeesAccrued(nativeCurrency), 0);
     }
 
@@ -1173,10 +1175,10 @@ contract PoolManagerTest is Test, Deployers {
 
         assertEq(manager.protocolFeesAccrued(nativeCurrency), expectedFees);
         assertEq(manager.protocolFeesAccrued(currency1), 0);
-        assertEq(nativeCurrency.balanceOf(address(1)), 0);
+        assertEq(nativeCurrency.balanceOf(recipientAddress), 0);
         vm.prank(feeController);
-        manager.collectProtocolFees(address(1), nativeCurrency, 0);
-        assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
+        manager.collectProtocolFees(recipientAddress, nativeCurrency, 0);
+        assertEq(nativeCurrency.balanceOf(recipientAddress), expectedFees);
         assertEq(manager.protocolFeesAccrued(nativeCurrency), 0);
     }
 

test/SkipCallsTestHook.t.sol

@@ -22,6 +22,7 @@ contract SkipCallsTest is Test, Deployers {
 
     function deploy(SkipCallsTestHook skipCallsTestHook) private {
         SkipCallsTestHook impl = new SkipCallsTestHook();
+        vm.allowCheatcodes(address(skipCallsTestHook));
         vm.etch(address(skipCallsTestHook), address(impl).code);
         deployFreshManagerAndRouters();
         skipCallsTestHook.setManager(IPoolManager(manager));

test/types/Currency.t.sol

@@ -11,13 +11,14 @@ import {CustomRevert} from "../../src/libraries/CustomRevert.sol";
 
 contract TestCurrency is Test {
     uint256 constant initialERC20Balance = 1000 ether;
-    address constant otherAddress = address(1);
+    address otherAddress;
 
     Currency nativeCurrency;
     Currency erc20Currency;
     CurrencyTest currencyTest;
 
     function setUp() public {
+        otherAddress = makeAddr("otherAddress");
         currencyTest = new CurrencyTest();
         vm.deal(address(currencyTest), 30 ether);
         nativeCurrency = Currency.wrap(address(0));