A few cleanup tasks (#437)

* Fix compiler warnings * todo for mapping transient * fixing tests with fuzzing * remove console logs * Update PoolDonateTest.sol * remove amount overload --------- Co-authored-by: Sara Reynolds <[email protected]>
Uniswap · Dec 14, 2023 · e7db92e · e7db92e
1 parent cf6f514
commit e7db92e
Show file tree

Hide file tree

Showing 17 changed files with 148 additions and 242 deletions.
diff --git a/.forge-snapshots/mint with empty hook.snap b/.forge-snapshots/mint with empty hook.snap
@@ -1 +1 @@
-319005
+319063
diff --git a/.forge-snapshots/mint with native token.snap b/.forge-snapshots/mint with native token.snap
@@ -1 +1 @@
-201786
+201844
diff --git a/.forge-snapshots/mint.snap b/.forge-snapshots/mint.snap
@@ -1 +1 @@
-201706
+201764
diff --git a/.forge-snapshots/mintWithEmptyHookEOAInitiated.snap b/.forge-snapshots/mintWithEmptyHookEOAInitiated.snap
@@ -1 +1 @@
-250901
+250959
diff --git a/.forge-snapshots/modify position with noop.snap b/.forge-snapshots/modify position with noop.snap
@@ -1 +1 @@
-56472
+56530
diff --git a/.forge-snapshots/swap with noop.snap b/.forge-snapshots/swap with noop.snap
@@ -1 +1 @@
-49689
+49690
diff --git a/foundry.toml b/foundry.toml
@@ -6,14 +6,13 @@ fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}, { access
 cancun = true
 
 [profile.default.fuzz]
-runs = 100
+runs = 1000
 seed = "0x4444"
 
 [profile.ci.fuzz]
-runs = 1000
+runs = 100000
 
 [profile.ci]
-fuzz_runs = 100000
 solc = "./bin/solc-static-linux"
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/src/PoolManager.sol b/src/PoolManager.sol
@@ -46,6 +46,7 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, ERC6909Claims {
 
     /// @dev Represents the currencies due/owed to each locker.
     /// Must all net to zero when the last lock is released.
+    /// TODO this needs to be transient
     mapping(address locker => mapping(Currency currency => int256 currencyDelta)) public currencyDelta;
 
     /// @inheritdoc IPoolManager
@@ -82,13 +83,13 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, ERC6909Claims {
         return pools[id].positions.get(_owner, tickLower, tickUpper).liquidity;
     }
 
-    function getPosition(PoolId id, address owner, int24 tickLower, int24 tickUpper)
+    function getPosition(PoolId id, address _owner, int24 tickLower, int24 tickUpper)
         external
         view
         override
         returns (Position.Info memory position)
     {
-        return pools[id].positions.get(owner, tickLower, tickUpper);
+        return pools[id].positions.get(_owner, tickLower, tickUpper);
     }
 
     /// @inheritdoc IPoolManager

diff --git a/src/test/PoolModifyPositionTest.sol b/src/test/PoolModifyPositionTest.sol
@@ -53,7 +53,7 @@ contract PoolModifyPositionTest is Test, PoolTestBase {
         (,,, int256 delta1) = _fetchBalances(data.key.currency1, data.sender);
 
         // These assertions only apply in non lock-accessing pools.
-        if (!data.key.hooks.hasPermissionToAccessLock()) {
+        if (!data.key.hooks.hasPermissionToAccessLock() && !data.key.fee.hasHookWithdrawFee()) {
             if (data.params.liquidityDelta > 0) {
                 assert(delta0 > 0 || delta1 > 0 || data.key.hooks.hasPermissionToNoOp());
                 assert(!(delta0 < 0 || delta1 < 0));

diff --git a/src/test/ProtocolFeeControllerTest.sol b/src/test/ProtocolFeeControllerTest.sol
@@ -28,22 +28,22 @@ contract ProtocolFeeControllerTest is IProtocolFeeController {
 
 /// @notice Reverts on call
 contract RevertingProtocolFeeControllerTest is IProtocolFeeController {
-    function protocolFeesForPool(PoolKey memory /* key */ ) external view returns (uint24) {
+    function protocolFeesForPool(PoolKey memory /* key */ ) external pure returns (uint24) {
         revert();
     }
 }
 
 /// @notice Returns an out of bounds protocol fee
 contract OutOfBoundsProtocolFeeControllerTest is IProtocolFeeController {
-    function protocolFeesForPool(PoolKey memory /* key */ ) external view returns (uint24) {
+    function protocolFeesForPool(PoolKey memory /* key */ ) external pure returns (uint24) {
         // set both swap and withdraw fees to 1, which is less than MIN_PROTOCOL_FEE_DENOMINATOR
         return 0x001001;
     }
 }
 
 /// @notice Return a value that overflows a uint24
 contract OverflowProtocolFeeControllerTest is IProtocolFeeController {
-    function protocolFeesForPool(PoolKey memory /* key */ ) external view returns (uint24) {
+    function protocolFeesForPool(PoolKey memory /* key */ ) external pure returns (uint24) {
         assembly {
             let ptr := mload(0x40)
             mstore(ptr, 0xFFFFAAA001)