migration custom accounting tests (Uniswap#729)

Aperture-Finance · May 29, 2024 · 59915ac · 59915ac
1 parent 9551e87
commit 59915ac
Show file tree

Hide file tree

Showing 10 changed files with 331 additions and 306 deletions.
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
@@ -1 +1 @@
-320738
+172605
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
@@ -1 +1 @@
-176325
+142125
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
@@ -1 +1 @@
-172779
+155691
diff --git a/test/CustomAccounting.t.sol b/test/CustomAccounting.t.sol
diff --git a/test/DynamicFees.t.sol b/test/DynamicFees.t.sol
@@ -57,7 +57,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
         dynamicFeesHooks.setManager(IPoolManager(manager));
         dynamicFeesNoHooks.setManager(IPoolManager(manager));
 
-        (currency0, currency1) = deployMintAndApprove2Currencies();
+        deployMintAndApprove2Currencies();
         (key,) = initPoolAndAddLiquidity(
             currency0,
             currency1,

diff --git a/test/DynamicReturnFees.t.sol b/test/DynamicReturnFees.t.sol
@@ -48,7 +48,7 @@ contract TestDynamicReturnFees is Test, Deployers, GasSnapshot {
         deployFreshManagerAndRouters();
         dynamicReturnFeesHook.setManager(IPoolManager(manager));
 
-        (currency0, currency1) = deployMintAndApprove2Currencies();
+        deployMintAndApprove2Currencies();
         (key,) = initPoolAndAddLiquidity(
             currency0,
             currency1,

diff --git a/test/PoolManager.t.sol b/test/PoolManager.t.sol
diff --git a/test/PoolManagerInitialize.t.sol b/test/PoolManagerInitialize.t.sol
@@ -42,7 +42,7 @@ contract PoolManagerInitializeTest is Test, Deployers, GasSnapshot {
 
     function setUp() public {
         deployFreshManagerAndRouters();
-        (currency0, currency1) = deployMintAndApprove2Currencies();
+        deployMintAndApprove2Currencies();
 
         uninitializedKey = PoolKey({
             currency0: currency0,

diff --git a/test/SkipCallsTestHook.t.sol b/test/SkipCallsTestHook.t.sol
@@ -28,7 +28,7 @@ contract SkipCallsTest is Test, Deployers, GasSnapshot {
         vm.etch(address(skipCallsTestHook), address(impl).code);
         deployFreshManagerAndRouters();
         skipCallsTestHook.setManager(IPoolManager(manager));
-        (currency0, currency1) = deployMintAndApprove2Currencies();
+        deployMintAndApprove2Currencies();
 
         assertEq(skipCallsTestHook.counter(), 0);
 

diff --git a/test/libraries/Pool.t.sol b/test/libraries/Pool.t.sol
@@ -91,7 +91,7 @@ contract PoolTest is Test, GasSnapshot {
         state.modifyLiquidity(params);
     }
 
-    function testSwap(
+    function test_fuzz_swap(
         uint160 sqrtPriceX96,
         uint24 lpFee,
         uint16 protocolFee0,