fix: forge coverage stack too deep

pancakeswap · Nov 11, 2024 · 9c8fa74 · 9c8fa74
1 parent 8c00656
commit 9c8fa74
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/.forge-snapshots/BinHookTest#testSwapSucceedsWithHook.snap b/.forge-snapshots/BinHookTest#testSwapSucceedsWithHook.snap
@@ -1 +1 @@
-189959
+190198
diff --git a/.forge-snapshots/BinPoolManagerBytecodeSize.snap b/.forge-snapshots/BinPoolManagerBytecodeSize.snap
@@ -1 +1 @@
-23548
+23602
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap
@@ -1 +1 @@
-177927
+178883
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap
@@ -1 +1 @@
-184209
+185165
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap
@@ -1 +1 @@
-133637
+133876
diff --git a/src/pool-bin/libraries/BinPool.sol b/src/pool-bin/libraries/BinPool.sol
@@ -169,15 +169,15 @@ library BinPool {
                         amountsInWithFees = amountsInWithFees.sub(pFee);
                     }
 
-                    bytes32 newReserve = binReserves.add(amountsInWithFees).sub(amountsOutOfBin);
                     if (
-                        newReserve.getLiquidity(swapState.activeId.getPriceFromId(params.binStep))
-                            > Constants.MAX_LIQUIDITY_PER_BIN
+                        (binReserves.add(amountsInWithFees).sub(amountsOutOfBin)).getLiquidity(
+                            swapState.activeId.getPriceFromId(params.binStep)
+                        ) > Constants.MAX_LIQUIDITY_PER_BIN
                     ) {
                         revert BinPool__MaxLiquidityPerBinExceeded();
                     }
 
-                    self.reserveOfBin[swapState.activeId] = newReserve;
+                    self.reserveOfBin[swapState.activeId] = binReserves.add(amountsInWithFees).sub(amountsOutOfBin);
                 }
             }
 
@@ -357,8 +357,7 @@ library BinPool {
         /// @dev overflow check on total reserves and the resulting liquidity
         uint256 price = activeId.getPriceFromId(binStep);
         bytes32 newReserves = binReserves.add(amountIn);
-        uint256 liquidity = newReserves.getLiquidity(price);
-        if (liquidity > Constants.MAX_LIQUIDITY_PER_BIN) {
+        if (newReserves.getLiquidity(price) > Constants.MAX_LIQUIDITY_PER_BIN) {
             revert BinPool__MaxLiquidityPerBinExceeded();
         }