From 278c3b719e8de933f3b6edfa72e9be0a067f7df7 Mon Sep 17 00:00:00 2001
From: Nishim Goyal <115455855+nishim3@users.noreply.github.com>
Date: Wed, 27 Mar 2024 14:56:14 +0530
Subject: [PATCH 1/5] rename Snaps

---
 ...ap => DynamicFees.swapWithDynamicFee.snap} |  0
 ...micFees.updateDynamicFeeInBeforeSwap.snap} |  0
 ...p.snap => Hooks.shouldCallBeforeSwap.snap} |  0
 ...ity.snap => PoolManager.addLiquidity.snap} |  0
 ...oolManager.addLiquidityWithEmptyHook.snap} |  0
 ...lManager.addLiquidityWithNativeToken.snap} |  0
 ...ize.snap => PoolManager.bytecodeSize.snap} |  0
 ...p => PoolManager.donateGasWith1Token.snap} |  0
 ... => PoolManager.donateGasWith2Tokens.snap} |  0
 ...PoolManager.erc20CollectProtocolFees.snap} |  0
 ...alize.snap => PoolManager.initialize.snap} |  0
 ...oolManager.nativeCollectProtocolFees.snap} |  0
 ....snap => PoolManager.removeLiquidity.snap} |  0
 ...Manager.removeLiquidityWithEmptyHook.snap} |  0
 ...nager.removeLiquidityWithNativeToken.snap} |  0
 ... swap.snap => PoolManager.simpleSwap.snap} |  0
 ... => PoolManager.simpleSwapWithNative.snap} |  0
 ... => PoolManager.swapAgainstLiquidity.snap} |  0
 ....swapAgainstLiquidityWithNativeToken.snap} |  0
 ... => PoolManager.swapBurn6909ForInput.snap} |  0
 ...oolManager.swapBurnNative6909ForInput.snap |  1 +
 ...olManager.swapMintNativeOutputAs6909.snap} |  0
 ... => PoolManager.swapMintOutputAs6909.snap} |  0
 ...ks.snap => PoolManager.swapWithHooks.snap} |  0
 .../swap burn native 6909 for input.snap      |  1 -
 test/DynamicFees.t.sol                        |  4 +-
 test/PoolManager.t.sol                        | 40 +++++++++----------
 test/PoolManagerInitialize.t.sol              |  2 +-
 test/libraries/Hooks.t.sol                    |  2 +-
 29 files changed, 25 insertions(+), 25 deletions(-)
 rename .forge-snapshots/{swap with dynamic fee.snap => DynamicFees.swapWithDynamicFee.snap} (100%)
 rename .forge-snapshots/{update dynamic fee in before swap.snap => DynamicFees.updateDynamicFeeInBeforeSwap.snap} (100%)
 rename .forge-snapshots/{HooksShouldCallBeforeSwap.snap => Hooks.shouldCallBeforeSwap.snap} (100%)
 rename .forge-snapshots/{addLiquidity.snap => PoolManager.addLiquidity.snap} (100%)
 rename .forge-snapshots/{addLiquidity with empty hook.snap => PoolManager.addLiquidityWithEmptyHook.snap} (100%)
 rename .forge-snapshots/{addLiquidity with native token.snap => PoolManager.addLiquidityWithNativeToken.snap} (100%)
 rename .forge-snapshots/{poolManager bytecode size.snap => PoolManager.bytecodeSize.snap} (100%)
 rename .forge-snapshots/{donate gas with 1 token.snap => PoolManager.donateGasWith1Token.snap} (100%)
 rename .forge-snapshots/{donate gas with 2 tokens.snap => PoolManager.donateGasWith2Tokens.snap} (100%)
 rename .forge-snapshots/{erc20 collect protocol fees.snap => PoolManager.erc20CollectProtocolFees.snap} (100%)
 rename .forge-snapshots/{initialize.snap => PoolManager.initialize.snap} (100%)
 rename .forge-snapshots/{native collect protocol fees.snap => PoolManager.nativeCollectProtocolFees.snap} (100%)
 rename .forge-snapshots/{removeLiquidity.snap => PoolManager.removeLiquidity.snap} (100%)
 rename .forge-snapshots/{removeLiquidity with empty hook.snap => PoolManager.removeLiquidityWithEmptyHook.snap} (100%)
 rename .forge-snapshots/{removeLiquidity with native token.snap => PoolManager.removeLiquidityWithNativeToken.snap} (100%)
 rename .forge-snapshots/{simple swap.snap => PoolManager.simpleSwap.snap} (100%)
 rename .forge-snapshots/{simple swap with native.snap => PoolManager.simpleSwapWithNative.snap} (100%)
 rename .forge-snapshots/{swap against liquidity.snap => PoolManager.swapAgainstLiquidity.snap} (100%)
 rename .forge-snapshots/{swap against liquidity with native token.snap => PoolManager.swapAgainstLiquidityWithNativeToken.snap} (100%)
 rename .forge-snapshots/{swap burn 6909 for input.snap => PoolManager.swapBurn6909ForInput.snap} (100%)
 create mode 100644 .forge-snapshots/PoolManager.swapBurnNative6909ForInput.snap
 rename .forge-snapshots/{swap mint native output as 6909.snap => PoolManager.swapMintNativeOutputAs6909.snap} (100%)
 rename .forge-snapshots/{swap mint output as 6909.snap => PoolManager.swapMintOutputAs6909.snap} (100%)
 rename .forge-snapshots/{swap with hooks.snap => PoolManager.swapWithHooks.snap} (100%)
 delete mode 100644 .forge-snapshots/swap burn native 6909 for input.snap

diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/DynamicFees.swapWithDynamicFee.snap
similarity index 100%
rename from .forge-snapshots/swap with dynamic fee.snap
rename to .forge-snapshots/DynamicFees.swapWithDynamicFee.snap
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/DynamicFees.updateDynamicFeeInBeforeSwap.snap
similarity index 100%
rename from .forge-snapshots/update dynamic fee in before swap.snap
rename to .forge-snapshots/DynamicFees.updateDynamicFeeInBeforeSwap.snap
diff --git a/.forge-snapshots/HooksShouldCallBeforeSwap.snap b/.forge-snapshots/Hooks.shouldCallBeforeSwap.snap
similarity index 100%
rename from .forge-snapshots/HooksShouldCallBeforeSwap.snap
rename to .forge-snapshots/Hooks.shouldCallBeforeSwap.snap
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/PoolManager.addLiquidity.snap
similarity index 100%
rename from .forge-snapshots/addLiquidity.snap
rename to .forge-snapshots/PoolManager.addLiquidity.snap
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/PoolManager.addLiquidityWithEmptyHook.snap
similarity index 100%
rename from .forge-snapshots/addLiquidity with empty hook.snap
rename to .forge-snapshots/PoolManager.addLiquidityWithEmptyHook.snap
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/PoolManager.addLiquidityWithNativeToken.snap
similarity index 100%
rename from .forge-snapshots/addLiquidity with native token.snap
rename to .forge-snapshots/PoolManager.addLiquidityWithNativeToken.snap
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/PoolManager.bytecodeSize.snap
similarity index 100%
rename from .forge-snapshots/poolManager bytecode size.snap
rename to .forge-snapshots/PoolManager.bytecodeSize.snap
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/PoolManager.donateGasWith1Token.snap
similarity index 100%
rename from .forge-snapshots/donate gas with 1 token.snap
rename to .forge-snapshots/PoolManager.donateGasWith1Token.snap
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/PoolManager.donateGasWith2Tokens.snap
similarity index 100%
rename from .forge-snapshots/donate gas with 2 tokens.snap
rename to .forge-snapshots/PoolManager.donateGasWith2Tokens.snap
diff --git a/.forge-snapshots/erc20 collect protocol fees.snap b/.forge-snapshots/PoolManager.erc20CollectProtocolFees.snap
similarity index 100%
rename from .forge-snapshots/erc20 collect protocol fees.snap
rename to .forge-snapshots/PoolManager.erc20CollectProtocolFees.snap
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/PoolManager.initialize.snap
similarity index 100%
rename from .forge-snapshots/initialize.snap
rename to .forge-snapshots/PoolManager.initialize.snap
diff --git a/.forge-snapshots/native collect protocol fees.snap b/.forge-snapshots/PoolManager.nativeCollectProtocolFees.snap
similarity index 100%
rename from .forge-snapshots/native collect protocol fees.snap
rename to .forge-snapshots/PoolManager.nativeCollectProtocolFees.snap
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/PoolManager.removeLiquidity.snap
similarity index 100%
rename from .forge-snapshots/removeLiquidity.snap
rename to .forge-snapshots/PoolManager.removeLiquidity.snap
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/PoolManager.removeLiquidityWithEmptyHook.snap
similarity index 100%
rename from .forge-snapshots/removeLiquidity with empty hook.snap
rename to .forge-snapshots/PoolManager.removeLiquidityWithEmptyHook.snap
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/PoolManager.removeLiquidityWithNativeToken.snap
similarity index 100%
rename from .forge-snapshots/removeLiquidity with native token.snap
rename to .forge-snapshots/PoolManager.removeLiquidityWithNativeToken.snap
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/PoolManager.simpleSwap.snap
similarity index 100%
rename from .forge-snapshots/simple swap.snap
rename to .forge-snapshots/PoolManager.simpleSwap.snap
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/PoolManager.simpleSwapWithNative.snap
similarity index 100%
rename from .forge-snapshots/simple swap with native.snap
rename to .forge-snapshots/PoolManager.simpleSwapWithNative.snap
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/PoolManager.swapAgainstLiquidity.snap
similarity index 100%
rename from .forge-snapshots/swap against liquidity.snap
rename to .forge-snapshots/PoolManager.swapAgainstLiquidity.snap
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/PoolManager.swapAgainstLiquidityWithNativeToken.snap
similarity index 100%
rename from .forge-snapshots/swap against liquidity with native token.snap
rename to .forge-snapshots/PoolManager.swapAgainstLiquidityWithNativeToken.snap
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/PoolManager.swapBurn6909ForInput.snap
similarity index 100%
rename from .forge-snapshots/swap burn 6909 for input.snap
rename to .forge-snapshots/PoolManager.swapBurn6909ForInput.snap
diff --git a/.forge-snapshots/PoolManager.swapBurnNative6909ForInput.snap b/.forge-snapshots/PoolManager.swapBurnNative6909ForInput.snap
new file mode 100644
index 000000000..7aa4a8671
--- /dev/null
+++ b/.forge-snapshots/PoolManager.swapBurnNative6909ForInput.snap
@@ -0,0 +1 @@
+76727
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/PoolManager.swapMintNativeOutputAs6909.snap
similarity index 100%
rename from .forge-snapshots/swap mint native output as 6909.snap
rename to .forge-snapshots/PoolManager.swapMintNativeOutputAs6909.snap
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/PoolManager.swapMintOutputAs6909.snap
similarity index 100%
rename from .forge-snapshots/swap mint output as 6909.snap
rename to .forge-snapshots/PoolManager.swapMintOutputAs6909.snap
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/PoolManager.swapWithHooks.snap
similarity index 100%
rename from .forge-snapshots/swap with hooks.snap
rename to .forge-snapshots/PoolManager.swapWithHooks.snap
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
deleted file mode 100644
index cc3b4460a..000000000
--- a/.forge-snapshots/swap burn native 6909 for input.snap	
+++ /dev/null
@@ -1 +0,0 @@
-76724
\ No newline at end of file
diff --git a/test/DynamicFees.t.sol b/test/DynamicFees.t.sol
index 9af8a928d..b2dc1d435 100644
--- a/test/DynamicFees.t.sol
+++ b/test/DynamicFees.t.sol
@@ -142,7 +142,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
         vm.expectEmit(true, true, true, true, address(manager));
         emit Swap(key.toId(), address(swapRouter), -100, 98, 79228162514264329749955861424, 1e18, -1, 123);
 
-        snapStart("update dynamic fee in before swap");
+        snapStart("DynamicFees.updateDynamicFeeInBeforeSwap");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -166,7 +166,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
         vm.expectEmit(true, true, true, true, address(manager));
         emit Swap(key.toId(), address(swapRouter), -100, 98, 79228162514264329749955861424, 1e18, -1, 123);
 
-        snapStart("swap with dynamic fee");
+        snapStart("DynamicFees.swapWithDynamicFee");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
     }
diff --git a/test/PoolManager.t.sol b/test/PoolManager.t.sol
index d0e2125ad..0ddb4ecd6 100644
--- a/test/PoolManager.t.sol
+++ b/test/PoolManager.t.sol
@@ -66,7 +66,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     }
 
     function test_bytecodeSize() public {
-        snapSize("poolManager bytecode size", address(manager));
+        snapSize("PoolManager.bytecodeSize", address(manager));
     }
 
     function test_feeControllerSet() public {
@@ -366,25 +366,25 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     }
 
     function test_addLiquidity_gas() public {
-        snapStart("addLiquidity");
+        snapStart("PoolManager.addLiquidity");
         modifyLiquidityRouter.modifyLiquidity(key, LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
 
     function test_removeLiquidity_gas() public {
-        snapStart("removeLiquidity");
+        snapStart("PoolManager.removeLiquidity");
         modifyLiquidityRouter.modifyLiquidity(key, REMOVE_LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
 
     function test_addLiquidity_withNative_gas() public {
-        snapStart("addLiquidity with native token");
+        snapStart("PoolManager.addLiquidityWithNativeToken");
         modifyLiquidityRouter.modifyLiquidity{value: 1 ether}(nativeKey, LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
 
     function test_removeLiquidity_withNative_gas() public {
-        snapStart("removeLiquidity with native token");
+        snapStart("PoolManager.removeLiquidityWithNativeToken");
         modifyLiquidityRouter.modifyLiquidity{value: 1 ether}(nativeKey, REMOVE_LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
@@ -397,7 +397,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         (key,) = initPool(currency0, currency1, mockHooks, 3000, SQRT_RATIO_1_1, ZERO_BYTES);
 
-        snapStart("addLiquidity with empty hook");
+        snapStart("PoolManager.addLiquidityWithEmptyHook");
         modifyLiquidityRouter.modifyLiquidity(key, LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
@@ -411,7 +411,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         (key,) = initPool(currency0, currency1, mockHooks, 3000, SQRT_RATIO_1_1, ZERO_BYTES);
         modifyLiquidityRouter.modifyLiquidity(key, LIQ_PARAMS, ZERO_BYTES);
 
-        snapStart("removeLiquidity with empty hook");
+        snapStart("PoolManager.removeLiquidityWithEmptyHook");
         modifyLiquidityRouter.modifyLiquidity(key, REMOVE_LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
@@ -566,7 +566,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         PoolSwapTest.TestSettings memory testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("simple swap");
+        snapStart("PoolManager.simpleSwap");
         swapRouter.swap(key, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -578,7 +578,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         PoolSwapTest.TestSettings memory testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("simple swap with native");
+        snapStart("PoolManager.simpleSwapWithNative");
         swapRouter.swap{value: 100}(nativeKey, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -605,7 +605,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("swap with hooks");
+        snapStart("PoolManager.swapWithHooks");
         swapRouter.swap(key, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -619,7 +619,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(0), address(this), CurrencyLibrary.toId(currency1), 98);
-        snapStart("swap mint output as 6909");
+        snapStart("PoolManager.swapMintOutputAs6909");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -636,7 +636,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(0), address(this), CurrencyLibrary.toId(CurrencyLibrary.NATIVE), 98);
-        snapStart("swap mint native output as 6909");
+        snapStart("PoolManager.swapMintNativeOutputAs6909");
         swapRouter.swap(nativeKey, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -668,7 +668,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(this), address(0), CurrencyLibrary.toId(currency1), 27);
-        snapStart("swap burn 6909 for input");
+        snapStart("PoolManager.swapBurn6909ForInput");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -700,7 +700,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(this), address(0), CurrencyLibrary.toId(CurrencyLibrary.NATIVE), 27);
-        snapStart("swap burn native 6909 for input");
+        snapStart("PoolManager.swapBurnNative6909ForInput");
         // don't have to send in native currency since burning 6909 for input
         swapRouter.swap(nativeKey, params, testSettings, ZERO_BYTES);
         snapEnd();
@@ -720,7 +720,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         params = IPoolManager.SwapParams({zeroForOne: true, amountSpecified: -100, sqrtPriceLimitX96: SQRT_RATIO_1_4});
 
-        snapStart("swap against liquidity");
+        snapStart("PoolManager.swapAgainstLiquidity");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -736,7 +736,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         params = IPoolManager.SwapParams({zeroForOne: true, amountSpecified: -100, sqrtPriceLimitX96: SQRT_RATIO_1_4});
 
-        snapStart("swap against liquidity with native token");
+        snapStart("PoolManager.swapAgainstLiquidityWithNativeToken");
         swapRouter.swap{value: 1 ether}(nativeKey, params, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -805,7 +805,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(feeGrowthGlobal0X128, 0);
         assertEq(feeGrowthGlobal1X128, 0);
 
-        snapStart("donate gas with 2 tokens");
+        snapStart("PoolManager.donateGasWith2Tokens");
         donateRouter.donate(key, 100, 200, ZERO_BYTES);
         snapEnd();
 
@@ -864,7 +864,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     }
 
     function test_donate_OneToken_gas() public {
-        snapStart("donate gas with 1 token");
+        snapStart("PoolManager.donateGasWith1Token");
         donateRouter.donate(key, 100, 0, ZERO_BYTES);
         snapEnd();
     }
@@ -1009,7 +1009,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(manager.protocolFeesAccrued(currency1), 0);
         assertEq(currency0.balanceOf(address(1)), 0);
         vm.prank(address(feeController));
-        snapStart("erc20 collect protocol fees");
+        snapStart("PoolManager.erc20CollectProtocolFees");
         manager.collectProtocolFees(address(1), currency0, expectedFees);
         snapEnd();
         assertEq(currency0.balanceOf(address(1)), expectedFees);
@@ -1065,7 +1065,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(manager.protocolFeesAccrued(currency1), 0);
         assertEq(nativeCurrency.balanceOf(address(1)), 0);
         vm.prank(address(feeController));
-        snapStart("native collect protocol fees");
+        snapStart("PoolManager.nativeCollectProtocolFees");
         manager.collectProtocolFees(address(1), nativeCurrency, expectedFees);
         snapEnd();
         assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
diff --git a/test/PoolManagerInitialize.t.sol b/test/PoolManagerInitialize.t.sol
index 56108d126..c7bc91716 100644
--- a/test/PoolManagerInitialize.t.sol
+++ b/test/PoolManagerInitialize.t.sol
@@ -387,7 +387,7 @@ contract PoolManagerInitializeTest is Test, Deployers, GasSnapshot {
     }
 
     function test_initialize_gas() public {
-        snapStart("initialize");
+        snapStart("PoolManager.initialize");
         manager.initialize(uninitializedKey, SQRT_RATIO_1_1, ZERO_BYTES);
         snapEnd();
     }
diff --git a/test/libraries/Hooks.t.sol b/test/libraries/Hooks.t.sol
index 2dc57cc12..5ccafc3e3 100644
--- a/test/libraries/Hooks.t.sol
+++ b/test/libraries/Hooks.t.sol
@@ -787,7 +787,7 @@ contract HooksTest is Test, Deployers, GasSnapshot {
     }
 
     function testGas() public {
-        snapStart("HooksShouldCallBeforeSwap");
+        snapStart("Hooks.shouldCallBeforeSwap");
         IHooks(address(0)).hasPermission(Hooks.BEFORE_SWAP_FLAG);
         snapEnd();
     }

From b5b6939978b380d45e1daa3dfdfb962c0f1f136f Mon Sep 17 00:00:00 2001
From: Nishim Goyal <115455855+nishim3@users.noreply.github.com>
Date: Wed, 27 Mar 2024 20:55:11 +0530
Subject: [PATCH 2/5] implement changes

---
 ...p => DynamicFees.swap_withDynamicFee.snap} |  0
 ...Fees.updateDynamicSwapFee_beforeSwap.snap} |  0
 ...oreSwap.snap => Hooks.callBeforeSwap.snap} |  0
 ...olManager.addLiquidity_withEmptyHook.snap} |  0
 ... PoolManager.addLiquidity_withNative.snap} |  0
 ...oolManager.collectProtocolFees_erc20.snap} |  0
 ...olManager.collectProtocolFees_native.snap} |  0
 ... => PoolManager.donate_gasWith1Token.snap} |  0
 ...=> PoolManager.donate_gasWith2Tokens.snap} |  0
 ...anager.removeLiquidity_withEmptyHook.snap} |  0
 ...olManager.removeLiquidity_withNative.snap} |  0
 ...=> PoolManager.simpleSwap_withNative.snap} |  0
 .../PoolManager.swapAgainstLiquidity.snap     |  1 -
 .../PoolManager.swapBurn6909ForInput.snap     |  1 -
 .../PoolManager.swap_againstLiquidity.snap    |  1 +
 ...swap_againstLiquidityWithNativeToken.snap} |  0
 .../PoolManager.swap_burn6909ForInput.snap    |  1 +
 ...lManager.swap_burnNative6909ForInput.snap} |  0
 ...lManager.swap_mintNativeOutputAs6909.snap} |  0
 ...=> PoolManager.swap_mintOutputAs6909.snap} |  0
 ...s.snap => PoolManager.swap_withHooks.snap} |  0
 test/DynamicFees.t.sol                        |  4 +--
 test/PoolManager.t.sol                        | 32 +++++++++----------
 test/libraries/Hooks.t.sol                    |  2 +-
 24 files changed, 21 insertions(+), 21 deletions(-)
 rename .forge-snapshots/{DynamicFees.swapWithDynamicFee.snap => DynamicFees.swap_withDynamicFee.snap} (100%)
 rename .forge-snapshots/{DynamicFees.updateDynamicFeeInBeforeSwap.snap => DynamicFees.updateDynamicSwapFee_beforeSwap.snap} (100%)
 rename .forge-snapshots/{Hooks.shouldCallBeforeSwap.snap => Hooks.callBeforeSwap.snap} (100%)
 rename .forge-snapshots/{PoolManager.addLiquidityWithEmptyHook.snap => PoolManager.addLiquidity_withEmptyHook.snap} (100%)
 rename .forge-snapshots/{PoolManager.addLiquidityWithNativeToken.snap => PoolManager.addLiquidity_withNative.snap} (100%)
 rename .forge-snapshots/{PoolManager.erc20CollectProtocolFees.snap => PoolManager.collectProtocolFees_erc20.snap} (100%)
 rename .forge-snapshots/{PoolManager.nativeCollectProtocolFees.snap => PoolManager.collectProtocolFees_native.snap} (100%)
 rename .forge-snapshots/{PoolManager.donateGasWith1Token.snap => PoolManager.donate_gasWith1Token.snap} (100%)
 rename .forge-snapshots/{PoolManager.donateGasWith2Tokens.snap => PoolManager.donate_gasWith2Tokens.snap} (100%)
 rename .forge-snapshots/{PoolManager.removeLiquidityWithEmptyHook.snap => PoolManager.removeLiquidity_withEmptyHook.snap} (100%)
 rename .forge-snapshots/{PoolManager.removeLiquidityWithNativeToken.snap => PoolManager.removeLiquidity_withNative.snap} (100%)
 rename .forge-snapshots/{PoolManager.simpleSwapWithNative.snap => PoolManager.simpleSwap_withNative.snap} (100%)
 delete mode 100644 .forge-snapshots/PoolManager.swapAgainstLiquidity.snap
 delete mode 100644 .forge-snapshots/PoolManager.swapBurn6909ForInput.snap
 create mode 100644 .forge-snapshots/PoolManager.swap_againstLiquidity.snap
 rename .forge-snapshots/{PoolManager.swapAgainstLiquidityWithNativeToken.snap => PoolManager.swap_againstLiquidityWithNativeToken.snap} (100%)
 create mode 100644 .forge-snapshots/PoolManager.swap_burn6909ForInput.snap
 rename .forge-snapshots/{PoolManager.swapBurnNative6909ForInput.snap => PoolManager.swap_burnNative6909ForInput.snap} (100%)
 rename .forge-snapshots/{PoolManager.swapMintNativeOutputAs6909.snap => PoolManager.swap_mintNativeOutputAs6909.snap} (100%)
 rename .forge-snapshots/{PoolManager.swapMintOutputAs6909.snap => PoolManager.swap_mintOutputAs6909.snap} (100%)
 rename .forge-snapshots/{PoolManager.swapWithHooks.snap => PoolManager.swap_withHooks.snap} (100%)

diff --git a/.forge-snapshots/DynamicFees.swapWithDynamicFee.snap b/.forge-snapshots/DynamicFees.swap_withDynamicFee.snap
similarity index 100%
rename from .forge-snapshots/DynamicFees.swapWithDynamicFee.snap
rename to .forge-snapshots/DynamicFees.swap_withDynamicFee.snap
diff --git a/.forge-snapshots/DynamicFees.updateDynamicFeeInBeforeSwap.snap b/.forge-snapshots/DynamicFees.updateDynamicSwapFee_beforeSwap.snap
similarity index 100%
rename from .forge-snapshots/DynamicFees.updateDynamicFeeInBeforeSwap.snap
rename to .forge-snapshots/DynamicFees.updateDynamicSwapFee_beforeSwap.snap
diff --git a/.forge-snapshots/Hooks.shouldCallBeforeSwap.snap b/.forge-snapshots/Hooks.callBeforeSwap.snap
similarity index 100%
rename from .forge-snapshots/Hooks.shouldCallBeforeSwap.snap
rename to .forge-snapshots/Hooks.callBeforeSwap.snap
diff --git a/.forge-snapshots/PoolManager.addLiquidityWithEmptyHook.snap b/.forge-snapshots/PoolManager.addLiquidity_withEmptyHook.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.addLiquidityWithEmptyHook.snap
rename to .forge-snapshots/PoolManager.addLiquidity_withEmptyHook.snap
diff --git a/.forge-snapshots/PoolManager.addLiquidityWithNativeToken.snap b/.forge-snapshots/PoolManager.addLiquidity_withNative.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.addLiquidityWithNativeToken.snap
rename to .forge-snapshots/PoolManager.addLiquidity_withNative.snap
diff --git a/.forge-snapshots/PoolManager.erc20CollectProtocolFees.snap b/.forge-snapshots/PoolManager.collectProtocolFees_erc20.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.erc20CollectProtocolFees.snap
rename to .forge-snapshots/PoolManager.collectProtocolFees_erc20.snap
diff --git a/.forge-snapshots/PoolManager.nativeCollectProtocolFees.snap b/.forge-snapshots/PoolManager.collectProtocolFees_native.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.nativeCollectProtocolFees.snap
rename to .forge-snapshots/PoolManager.collectProtocolFees_native.snap
diff --git a/.forge-snapshots/PoolManager.donateGasWith1Token.snap b/.forge-snapshots/PoolManager.donate_gasWith1Token.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.donateGasWith1Token.snap
rename to .forge-snapshots/PoolManager.donate_gasWith1Token.snap
diff --git a/.forge-snapshots/PoolManager.donateGasWith2Tokens.snap b/.forge-snapshots/PoolManager.donate_gasWith2Tokens.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.donateGasWith2Tokens.snap
rename to .forge-snapshots/PoolManager.donate_gasWith2Tokens.snap
diff --git a/.forge-snapshots/PoolManager.removeLiquidityWithEmptyHook.snap b/.forge-snapshots/PoolManager.removeLiquidity_withEmptyHook.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.removeLiquidityWithEmptyHook.snap
rename to .forge-snapshots/PoolManager.removeLiquidity_withEmptyHook.snap
diff --git a/.forge-snapshots/PoolManager.removeLiquidityWithNativeToken.snap b/.forge-snapshots/PoolManager.removeLiquidity_withNative.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.removeLiquidityWithNativeToken.snap
rename to .forge-snapshots/PoolManager.removeLiquidity_withNative.snap
diff --git a/.forge-snapshots/PoolManager.simpleSwapWithNative.snap b/.forge-snapshots/PoolManager.simpleSwap_withNative.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.simpleSwapWithNative.snap
rename to .forge-snapshots/PoolManager.simpleSwap_withNative.snap
diff --git a/.forge-snapshots/PoolManager.swapAgainstLiquidity.snap b/.forge-snapshots/PoolManager.swapAgainstLiquidity.snap
deleted file mode 100644
index 0ec8c8c2e..000000000
--- a/.forge-snapshots/PoolManager.swapAgainstLiquidity.snap
+++ /dev/null
@@ -1 +0,0 @@
-60655
\ No newline at end of file
diff --git a/.forge-snapshots/PoolManager.swapBurn6909ForInput.snap b/.forge-snapshots/PoolManager.swapBurn6909ForInput.snap
deleted file mode 100644
index 7be6ba8dd..000000000
--- a/.forge-snapshots/PoolManager.swapBurn6909ForInput.snap
+++ /dev/null
@@ -1 +0,0 @@
-80769
\ No newline at end of file
diff --git a/.forge-snapshots/PoolManager.swap_againstLiquidity.snap b/.forge-snapshots/PoolManager.swap_againstLiquidity.snap
new file mode 100644
index 000000000..a8b23d9fb
--- /dev/null
+++ b/.forge-snapshots/PoolManager.swap_againstLiquidity.snap
@@ -0,0 +1 @@
+60658
\ No newline at end of file
diff --git a/.forge-snapshots/PoolManager.swapAgainstLiquidityWithNativeToken.snap b/.forge-snapshots/PoolManager.swap_againstLiquidityWithNativeToken.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.swapAgainstLiquidityWithNativeToken.snap
rename to .forge-snapshots/PoolManager.swap_againstLiquidityWithNativeToken.snap
diff --git a/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap b/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap
new file mode 100644
index 000000000..5977a04d0
--- /dev/null
+++ b/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap
@@ -0,0 +1 @@
+80772
\ No newline at end of file
diff --git a/.forge-snapshots/PoolManager.swapBurnNative6909ForInput.snap b/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.swapBurnNative6909ForInput.snap
rename to .forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap
diff --git a/.forge-snapshots/PoolManager.swapMintNativeOutputAs6909.snap b/.forge-snapshots/PoolManager.swap_mintNativeOutputAs6909.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.swapMintNativeOutputAs6909.snap
rename to .forge-snapshots/PoolManager.swap_mintNativeOutputAs6909.snap
diff --git a/.forge-snapshots/PoolManager.swapMintOutputAs6909.snap b/.forge-snapshots/PoolManager.swap_mintOutputAs6909.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.swapMintOutputAs6909.snap
rename to .forge-snapshots/PoolManager.swap_mintOutputAs6909.snap
diff --git a/.forge-snapshots/PoolManager.swapWithHooks.snap b/.forge-snapshots/PoolManager.swap_withHooks.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.swapWithHooks.snap
rename to .forge-snapshots/PoolManager.swap_withHooks.snap
diff --git a/test/DynamicFees.t.sol b/test/DynamicFees.t.sol
index b2dc1d435..3072ae220 100644
--- a/test/DynamicFees.t.sol
+++ b/test/DynamicFees.t.sol
@@ -142,7 +142,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
         vm.expectEmit(true, true, true, true, address(manager));
         emit Swap(key.toId(), address(swapRouter), -100, 98, 79228162514264329749955861424, 1e18, -1, 123);
 
-        snapStart("DynamicFees.updateDynamicFeeInBeforeSwap");
+        snapStart("DynamicFees.updateDynamicSwapFee_beforeSwap");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -166,7 +166,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
         vm.expectEmit(true, true, true, true, address(manager));
         emit Swap(key.toId(), address(swapRouter), -100, 98, 79228162514264329749955861424, 1e18, -1, 123);
 
-        snapStart("DynamicFees.swapWithDynamicFee");
+        snapStart("DynamicFees.swap_withDynamicFee");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
     }
diff --git a/test/PoolManager.t.sol b/test/PoolManager.t.sol
index 0ddb4ecd6..4af7c2577 100644
--- a/test/PoolManager.t.sol
+++ b/test/PoolManager.t.sol
@@ -378,13 +378,13 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     }
 
     function test_addLiquidity_withNative_gas() public {
-        snapStart("PoolManager.addLiquidityWithNativeToken");
+        snapStart("PoolManager.addLiquidity_withNative");
         modifyLiquidityRouter.modifyLiquidity{value: 1 ether}(nativeKey, LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
 
     function test_removeLiquidity_withNative_gas() public {
-        snapStart("PoolManager.removeLiquidityWithNativeToken");
+        snapStart("PoolManager.removeLiquidity_withNative");
         modifyLiquidityRouter.modifyLiquidity{value: 1 ether}(nativeKey, REMOVE_LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
@@ -397,7 +397,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         (key,) = initPool(currency0, currency1, mockHooks, 3000, SQRT_RATIO_1_1, ZERO_BYTES);
 
-        snapStart("PoolManager.addLiquidityWithEmptyHook");
+        snapStart("PoolManager.addLiquidity_withEmptyHook");
         modifyLiquidityRouter.modifyLiquidity(key, LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
@@ -411,7 +411,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         (key,) = initPool(currency0, currency1, mockHooks, 3000, SQRT_RATIO_1_1, ZERO_BYTES);
         modifyLiquidityRouter.modifyLiquidity(key, LIQ_PARAMS, ZERO_BYTES);
 
-        snapStart("PoolManager.removeLiquidityWithEmptyHook");
+        snapStart("PoolManager.removeLiquidity_withEmptyHook");
         modifyLiquidityRouter.modifyLiquidity(key, REMOVE_LIQ_PARAMS, ZERO_BYTES);
         snapEnd();
     }
@@ -578,7 +578,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         PoolSwapTest.TestSettings memory testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("PoolManager.simpleSwapWithNative");
+        snapStart("PoolManager.simpleSwap_withNative");
         swapRouter.swap{value: 100}(nativeKey, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -605,7 +605,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("PoolManager.swapWithHooks");
+        snapStart("PoolManager.swap_withHooks");
         swapRouter.swap(key, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -619,7 +619,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(0), address(this), CurrencyLibrary.toId(currency1), 98);
-        snapStart("PoolManager.swapMintOutputAs6909");
+        snapStart("PoolManager.swap_mintOutputAs6909");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -636,7 +636,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(0), address(this), CurrencyLibrary.toId(CurrencyLibrary.NATIVE), 98);
-        snapStart("PoolManager.swapMintNativeOutputAs6909");
+        snapStart("PoolManager.swap_mintNativeOutputAs6909");
         swapRouter.swap(nativeKey, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -668,7 +668,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(this), address(0), CurrencyLibrary.toId(currency1), 27);
-        snapStart("PoolManager.swapBurn6909ForInput");
+        snapStart("PoolManager.swap_burn6909ForInput");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
@@ -700,7 +700,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         vm.expectEmit();
         emit Transfer(address(swapRouter), address(this), address(0), CurrencyLibrary.toId(CurrencyLibrary.NATIVE), 27);
-        snapStart("PoolManager.swapBurnNative6909ForInput");
+        snapStart("PoolManager.swap_burnNative6909ForInput");
         // don't have to send in native currency since burning 6909 for input
         swapRouter.swap(nativeKey, params, testSettings, ZERO_BYTES);
         snapEnd();
@@ -720,7 +720,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         params = IPoolManager.SwapParams({zeroForOne: true, amountSpecified: -100, sqrtPriceLimitX96: SQRT_RATIO_1_4});
 
-        snapStart("PoolManager.swapAgainstLiquidity");
+        snapStart("PoolManager.swap_againstLiquidity");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -736,7 +736,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
 
         params = IPoolManager.SwapParams({zeroForOne: true, amountSpecified: -100, sqrtPriceLimitX96: SQRT_RATIO_1_4});
 
-        snapStart("PoolManager.swapAgainstLiquidityWithNativeToken");
+        snapStart("PoolManager.swap_againstLiquidityWithNativeToken");
         swapRouter.swap{value: 1 ether}(nativeKey, params, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -805,7 +805,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(feeGrowthGlobal0X128, 0);
         assertEq(feeGrowthGlobal1X128, 0);
 
-        snapStart("PoolManager.donateGasWith2Tokens");
+        snapStart("PoolManager.donate_gasWith2Tokens");
         donateRouter.donate(key, 100, 200, ZERO_BYTES);
         snapEnd();
 
@@ -864,7 +864,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     }
 
     function test_donate_OneToken_gas() public {
-        snapStart("PoolManager.donateGasWith1Token");
+        snapStart("PoolManager.donate_gasWith1Token");
         donateRouter.donate(key, 100, 0, ZERO_BYTES);
         snapEnd();
     }
@@ -1009,7 +1009,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(manager.protocolFeesAccrued(currency1), 0);
         assertEq(currency0.balanceOf(address(1)), 0);
         vm.prank(address(feeController));
-        snapStart("PoolManager.erc20CollectProtocolFees");
+        snapStart("PoolManager.collectProtocolFees_erc20");
         manager.collectProtocolFees(address(1), currency0, expectedFees);
         snapEnd();
         assertEq(currency0.balanceOf(address(1)), expectedFees);
@@ -1065,7 +1065,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(manager.protocolFeesAccrued(currency1), 0);
         assertEq(nativeCurrency.balanceOf(address(1)), 0);
         vm.prank(address(feeController));
-        snapStart("PoolManager.nativeCollectProtocolFees");
+        snapStart("PoolManager.collectProtocolFees_native");
         manager.collectProtocolFees(address(1), nativeCurrency, expectedFees);
         snapEnd();
         assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
diff --git a/test/libraries/Hooks.t.sol b/test/libraries/Hooks.t.sol
index 5ccafc3e3..1a8c8a3d1 100644
--- a/test/libraries/Hooks.t.sol
+++ b/test/libraries/Hooks.t.sol
@@ -787,7 +787,7 @@ contract HooksTest is Test, Deployers, GasSnapshot {
     }
 
     function testGas() public {
-        snapStart("Hooks.shouldCallBeforeSwap");
+        snapStart("Hooks.callBeforeSwap");
         IHooks(address(0)).hasPermission(Hooks.BEFORE_SWAP_FLAG);
         snapEnd();
     }

From 79b986588d7afa669b4d5b7bc10938b68356ea86 Mon Sep 17 00:00:00 2001
From: Nishim Goyal <115455855+nishim3@users.noreply.github.com>
Date: Thu, 28 Mar 2024 04:07:45 +0530
Subject: [PATCH 3/5] add suggestions

---
 test/DynamicFees.t.sol | 2 +-
 test/PoolManager.t.sol | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/DynamicFees.t.sol b/test/DynamicFees.t.sol
index 3072ae220..d6f32784c 100644
--- a/test/DynamicFees.t.sol
+++ b/test/DynamicFees.t.sol
@@ -142,7 +142,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
         vm.expectEmit(true, true, true, true, address(manager));
         emit Swap(key.toId(), address(swapRouter), -100, 98, 79228162514264329749955861424, 1e18, -1, 123);
 
-        snapStart("DynamicFees.updateDynamicSwapFee_beforeSwap");
+        snapStart("DynamicFees.swap_updateDynamicFeeInBeforeSwap");
         swapRouter.swap(key, params, testSettings, ZERO_BYTES);
         snapEnd();
 
diff --git a/test/PoolManager.t.sol b/test/PoolManager.t.sol
index 4af7c2577..65bdf04c0 100644
--- a/test/PoolManager.t.sol
+++ b/test/PoolManager.t.sol
@@ -566,7 +566,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         PoolSwapTest.TestSettings memory testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("PoolManager.simpleSwap");
+        snapStart("PoolManager.swap_simple");
         swapRouter.swap(key, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }
@@ -578,7 +578,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         PoolSwapTest.TestSettings memory testSettings =
             PoolSwapTest.TestSettings({withdrawTokens: true, settleUsingTransfer: true, currencyAlreadySent: false});
 
-        snapStart("PoolManager.simpleSwap_withNative");
+        snapStart("PoolManager.swap_simpleWithNative");
         swapRouter.swap{value: 100}(nativeKey, swapParams, testSettings, ZERO_BYTES);
         snapEnd();
     }

From 86a167b0d3f82db68a889c2216f154d1a71309e5 Mon Sep 17 00:00:00 2001
From: Nishim Goyal <115455855+nishim3@users.noreply.github.com>
Date: Thu, 28 Mar 2024 04:08:31 +0530
Subject: [PATCH 4/5] add suggestions

---
 ...ap.snap => DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap} | 0
 .../{PoolManager.simpleSwap.snap => PoolManager.swap_simple.snap} | 0
 ...wap_withNative.snap => PoolManager.swap_simpleWithNative.snap} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename .forge-snapshots/{DynamicFees.updateDynamicSwapFee_beforeSwap.snap => DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap} (100%)
 rename .forge-snapshots/{PoolManager.simpleSwap.snap => PoolManager.swap_simple.snap} (100%)
 rename .forge-snapshots/{PoolManager.simpleSwap_withNative.snap => PoolManager.swap_simpleWithNative.snap} (100%)

diff --git a/.forge-snapshots/DynamicFees.updateDynamicSwapFee_beforeSwap.snap b/.forge-snapshots/DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap
similarity index 100%
rename from .forge-snapshots/DynamicFees.updateDynamicSwapFee_beforeSwap.snap
rename to .forge-snapshots/DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap
diff --git a/.forge-snapshots/PoolManager.simpleSwap.snap b/.forge-snapshots/PoolManager.swap_simple.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.simpleSwap.snap
rename to .forge-snapshots/PoolManager.swap_simple.snap
diff --git a/.forge-snapshots/PoolManager.simpleSwap_withNative.snap b/.forge-snapshots/PoolManager.swap_simpleWithNative.snap
similarity index 100%
rename from .forge-snapshots/PoolManager.simpleSwap_withNative.snap
rename to .forge-snapshots/PoolManager.swap_simpleWithNative.snap

From a9287fd770f49a3dacae428735beb7e308a12732 Mon Sep 17 00:00:00 2001
From: Nishim Goyal <115455855+nishim3@users.noreply.github.com>
Date: Fri, 19 Apr 2024 02:06:35 +0530
Subject: [PATCH 5/5] update snaps

---
 .forge-snapshots/PoolManager.swap_againstLiquidity.snap         | 2 +-
 .forge-snapshots/PoolManager.swap_burn6909ForInput.snap         | 2 +-
 .forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap   | 2 +-
 .../SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.forge-snapshots/PoolManager.swap_againstLiquidity.snap b/.forge-snapshots/PoolManager.swap_againstLiquidity.snap
index 8209798a6..8c57e0370 100644
--- a/.forge-snapshots/PoolManager.swap_againstLiquidity.snap
+++ b/.forge-snapshots/PoolManager.swap_againstLiquidity.snap
@@ -1 +1 @@
-60138
\ No newline at end of file
+61480
\ No newline at end of file
diff --git a/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap b/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap
index 957d1faa2..0b6bee6b5 100644
--- a/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap
+++ b/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap
@@ -1 +1 @@
-80315
\ No newline at end of file
+79372
\ No newline at end of file
diff --git a/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap b/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap
index 3a61378cc..1a9c91b86 100644
--- a/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap
+++ b/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap
@@ -1 +1 @@
-76165
\ No newline at end of file
+75215
\ No newline at end of file
diff --git a/.forge-snapshots/SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap b/.forge-snapshots/SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap
index 828d0d44f..7b95765fd 100644
--- a/.forge-snapshots/SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap
+++ b/.forge-snapshots/SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap
@@ -1 +1 @@
-155723
\ No newline at end of file
+158801
\ No newline at end of file