consistent usage of _mapRecipient

Uniswap · Sep 3, 2024 · 3160edd · 3160edd
1 parent 8a43068
commit 3160edd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
@@ -1 +1 @@
-123475
+123465
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
@@ -1 +1 @@
-130553
+130544
diff --git a/.forge-snapshots/PositionManager_collect_withTakePair.snap b/.forge-snapshots/PositionManager_collect_withTakePair.snap
@@ -1 +1 @@
-150653
+150641
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
@@ -1 +1 @@
-116196
+116184
diff --git a/src/PositionManager.sol b/src/PositionManager.sol
@@ -233,8 +233,8 @@ contract PositionManager is
                 _settlePair(currency0, currency1);
                 return;
             } else if (action == Actions.TAKE_PAIR) {
-                (Currency currency0, Currency currency1, address to) = params.decodeCurrencyPairAndAddress();
-                _takePair(currency0, currency1, to);
+                (Currency currency0, Currency currency1, address recipient) = params.decodeCurrencyPairAndAddress();
+                _takePair(currency0, currency1, _mapRecipient(recipient));
                 return;
             } else if (action == Actions.SETTLE) {
                 (Currency currency, uint256 amount, bool payerIsUser) = params.decodeCurrencyUint256AndBool();
@@ -349,8 +349,7 @@ contract PositionManager is
         _settle(currency1, caller, _getFullDebt(currency1));
     }
 
-    function _takePair(Currency currency0, Currency currency1, address to) internal {
-        address recipient = _mapRecipient(to);
+    function _takePair(Currency currency0, Currency currency1, address recipient) internal {
         _take(currency0, recipient, _getFullCredit(currency0));
         _take(currency1, recipient, _getFullCredit(currency1));
     }