diff --git a/foundry.lock b/foundry.lock new file mode 100644 index 000000000..e9c82be31 --- /dev/null +++ b/foundry.lock @@ -0,0 +1,11 @@ +{ + "lib/openzeppelin-contracts": { + "rev": "dbb6104ce834628e473d2173bbc9d47f81a9eec3" + }, + "lib/forge-std": { + "rev": "1de6eecf821de7fe2c908cc48d3ab3dced20717f" + }, + "lib/solmate": { + "rev": "4b47a19038b798b4a33d9749d25e570443520647" + } +} \ No newline at end of file diff --git a/snapshots/CustomAccountingTest.json b/snapshots/CustomAccountingTest.json index 348909c5f..fe2cfa1d0 100644 --- a/snapshots/CustomAccountingTest.json +++ b/snapshots/CustomAccountingTest.json @@ -1,6 +1,6 @@ { - "addLiquidity CA fee": "170695", - "removeLiquidity CA fee": "141199", - "swap CA custom curve + swap noop": "124402", - "swap CA fee on unspecified": "154572" + "addLiquidity CA fee": "67203", + "removeLiquidity CA fee": "60619", + "swap CA custom curve + swap noop": "63522", + "swap CA fee on unspecified": "84080" } \ No newline at end of file diff --git a/snapshots/ERC6909ClaimsTest.json b/snapshots/ERC6909ClaimsTest.json index bf1a063d7..61ef512b2 100644 --- a/snapshots/ERC6909ClaimsTest.json +++ b/snapshots/ERC6909ClaimsTest.json @@ -1,9 +1,9 @@ { - "ERC6909Claims approve": "46323", - "ERC6909Claims burn": "29389", - "ERC6909Claims mint": "46603", - "ERC6909Claims transfer": "51756", - "ERC6909Claims transferFrom as operator": "54437", - "ERC6909Claims transferFrom with approval": "59939", - "ERC6909Claims transferFrom with infinite approval": "56770" + "ERC6909Claims approve": "24815", + "ERC6909Claims burn": "3233", + "ERC6909Claims mint": "25095", + "ERC6909Claims transfer": "25448", + "ERC6909Claims transferFrom as operator": "25977", + "ERC6909Claims transferFrom with approval": "28679", + "ERC6909Claims transferFrom with infinite approval": "28310" } \ No newline at end of file diff --git a/snapshots/ExtsloadTest.json b/snapshots/ExtsloadTest.json index 7de480d43..31ed61658 100644 --- a/snapshots/ExtsloadTest.json +++ b/snapshots/ExtsloadTest.json @@ -1,3 +1,3 @@ { - "sparse external sload": "22164" + "sparse external sload": "2164" } \ No newline at end of file diff --git a/snapshots/ModifyLiquidityTest.json b/snapshots/ModifyLiquidityTest.json index 7744b9abe..f65fba34b 100644 --- a/snapshots/ModifyLiquidityTest.json +++ b/snapshots/ModifyLiquidityTest.json @@ -1,4 +1,4 @@ { - "add liquidity to already existing position with salt": "144401", - "create new liquidity to a position with salt": "292593" + "add liquidity to already existing position with salt": "52997", + "create new liquidity to a position with salt": "269089" } \ No newline at end of file diff --git a/snapshots/PoolManagerInitializeTest.json b/snapshots/PoolManagerInitializeTest.json index 4c6900768..e04443b07 100644 --- a/snapshots/PoolManagerInitializeTest.json +++ b/snapshots/PoolManagerInitializeTest.json @@ -1,3 +1,3 @@ { - "initialize": "51532" + "initialize": "29172" } \ No newline at end of file diff --git a/snapshots/PoolManagerTest.json b/snapshots/PoolManagerTest.json index 594357f46..0ecb90e96 100644 --- a/snapshots/PoolManagerTest.json +++ b/snapshots/PoolManagerTest.json @@ -1,25 +1,25 @@ { - "addLiquidity with empty hook": "274012", - "addLiquidity with native token": "135001", - "donate gas with 1 token": "106214", - "donate gas with 2 tokens": "145510", - "erc20 collect protocol fees": "57728", - "native collect protocol fees": "59371", + "addLiquidity with empty hook": "243508", + "addLiquidity with native token": "111761", + "donate gas with 1 token": "83458", + "donate gas with 2 tokens": "116242", + "erc20 collect protocol fees": "24488", + "native collect protocol fees": "33171", "poolManager bytecode size": "24009", "poolManager initcode hash (without constructor params, as uint256)": "19281018184167079101887460999643277467915809731640262058315305465805214934776", - "removeLiquidity with empty hook": "130613", - "removeLiquidity with native token": "112523", - "simple addLiquidity": "161276", - "simple addLiquidity second addition same range": "98731", - "simple removeLiquidity": "85099", - "simple removeLiquidity some liquidity remains": "92986", - "simple swap": "123144", - "simple swap with native": "108434", - "swap against liquidity": "116527", - "swap against liquidity with native token": "105569", - "swap burn 6909 for input": "129285", - "swap burn native 6909 for input": "118672", - "swap mint native output as 6909": "139620", - "swap mint output as 6909": "154985", - "swap with hooks": "132165" + "removeLiquidity with empty hook": "59621", + "removeLiquidity with native token": "117125", + "simple addLiquidity": "137424", + "simple addLiquidity second addition same range": "29879", + "simple removeLiquidity": "27559", + "simple removeLiquidity some liquidity remains": "25846", + "simple swap": "100000", + "simple swap with native": "85530", + "swap against liquidity": "50679", + "swap against liquidity with native token": "54061", + "swap burn 6909 for input": "69409", + "swap burn native 6909 for input": "65524", + "swap mint native output as 6909": "116168", + "swap mint output as 6909": "131293", + "swap with hooks": "55793" } \ No newline at end of file diff --git a/snapshots/ProtocolFeesTest.json b/snapshots/ProtocolFeesTest.json index 9b33cd5ff..80c1d4ab0 100644 --- a/snapshots/ProtocolFeesTest.json +++ b/snapshots/ProtocolFeesTest.json @@ -1,3 +1,3 @@ { - "set protocol fee": "31730" + "set protocol fee": "2546" } \ No newline at end of file diff --git a/snapshots/SkipCallsTest.json b/snapshots/SkipCallsTest.json index 6aa00e361..0ae759fc4 100644 --- a/snapshots/SkipCallsTest.json +++ b/snapshots/SkipCallsTest.json @@ -1,3 +1,3 @@ { - "swap skips hook call if hook is caller": "206030" + "swap skips hook call if hook is caller": "129230" } \ No newline at end of file diff --git a/snapshots/StateLibraryTest.json b/snapshots/StateLibraryTest.json index d3cd20d30..6d36ff0dc 100644 --- a/snapshots/StateLibraryTest.json +++ b/snapshots/StateLibraryTest.json @@ -1,12 +1,12 @@ { - "extsload getFeeGrowthGlobals": "4774", - "extsload getFeeGrowthInside": "2375", - "extsload getLiquidity": "2375", - "extsload getPositionInfo": "6949", - "extsload getPositionLiquidity": "2375", - "extsload getSlot0": "2375", - "extsload getTickBitmap": "2375", - "extsload getTickFeeGrowthOutside": "4774", - "extsload getTickInfo": "6949", - "extsload getTickLiquidity": "2375" + "extsload getFeeGrowthGlobals": "774", + "extsload getFeeGrowthInside": "375", + "extsload getLiquidity": "375", + "extsload getPositionInfo": "949", + "extsload getPositionLiquidity": "375", + "extsload getSlot0": "375", + "extsload getTickBitmap": "375", + "extsload getTickFeeGrowthOutside": "774", + "extsload getTickInfo": "949", + "extsload getTickLiquidity": "375" } \ No newline at end of file diff --git a/snapshots/SyncTest.json b/snapshots/SyncTest.json index 0cd2e9195..80aa773b0 100644 --- a/snapshots/SyncTest.json +++ b/snapshots/SyncTest.json @@ -1,3 +1,3 @@ { - "getReserves": "5973" + "getReserves": "3973" } \ No newline at end of file diff --git a/snapshots/TestDynamicFees.json b/snapshots/TestDynamicFees.json index b25bd6b18..83a120a6f 100644 --- a/snapshots/TestDynamicFees.json +++ b/snapshots/TestDynamicFees.json @@ -1,4 +1,4 @@ { - "swap with dynamic fee": "139153", - "update dynamic fee in before swap": "147743" + "swap with dynamic fee": "75769", + "update dynamic fee in before swap": "114847" } \ No newline at end of file diff --git a/snapshots/TestDynamicReturnFees.json b/snapshots/TestDynamicReturnFees.json index d2635299d..81c9bb52d 100644 --- a/snapshots/TestDynamicReturnFees.json +++ b/snapshots/TestDynamicReturnFees.json @@ -1,3 +1,3 @@ { - "swap with return dynamic fee": "145475" + "swap with return dynamic fee": "112567" } \ No newline at end of file diff --git a/src/PoolManager.sol b/src/PoolManager.sol index e28299513..4fc97802f 100644 --- a/src/PoolManager.sol +++ b/src/PoolManager.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.26; import {Hooks} from "./libraries/Hooks.sol"; import {Pool} from "./libraries/Pool.sol"; import {SafeCast} from "./libraries/SafeCast.sol"; -import {Position} from "./libraries/Position.sol"; import {LPFeeLibrary} from "./libraries/LPFeeLibrary.sol"; import {Currency, CurrencyLibrary} from "./types/Currency.sol"; import {PoolKey} from "./types/PoolKey.sol"; diff --git a/src/libraries/Hooks.sol b/src/libraries/Hooks.sol index 15e5a38cd..de6f6dad2 100644 --- a/src/libraries/Hooks.sol +++ b/src/libraries/Hooks.sol @@ -7,7 +7,6 @@ import {SafeCast} from "./SafeCast.sol"; import {LPFeeLibrary} from "./LPFeeLibrary.sol"; import {BalanceDelta, toBalanceDelta, BalanceDeltaLibrary} from "../types/BalanceDelta.sol"; import {BeforeSwapDelta, BeforeSwapDeltaLibrary} from "../types/BeforeSwapDelta.sol"; -import {IPoolManager} from "../interfaces/IPoolManager.sol"; import {ModifyLiquidityParams, SwapParams} from "../types/PoolOperation.sol"; import {ParseBytes} from "./ParseBytes.sol"; import {CustomRevert} from "./CustomRevert.sol"; diff --git a/src/test/BaseTestHooks.sol b/src/test/BaseTestHooks.sol index a902cb3c3..960b50fa4 100644 --- a/src/test/BaseTestHooks.sol +++ b/src/test/BaseTestHooks.sol @@ -6,7 +6,6 @@ import {PoolKey} from "../types/PoolKey.sol"; import {ModifyLiquidityParams, SwapParams} from "../types/PoolOperation.sol"; import {BalanceDelta} from "../types/BalanceDelta.sol"; import {BeforeSwapDelta} from "../types/BeforeSwapDelta.sol"; -import {IPoolManager} from "../interfaces/IPoolManager.sol"; contract BaseTestHooks is IHooks { error HookNotImplemented(); diff --git a/src/test/EmptyTestHooks.sol b/src/test/EmptyTestHooks.sol index 671616976..7840b34e3 100644 --- a/src/test/EmptyTestHooks.sol +++ b/src/test/EmptyTestHooks.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.24; import {Hooks} from "../libraries/Hooks.sol"; import {IHooks} from "../interfaces/IHooks.sol"; -import {IPoolManager} from "../interfaces/IPoolManager.sol"; import {ModifyLiquidityParams, SwapParams} from "../types/PoolOperation.sol"; import {PoolKey} from "../types/PoolKey.sol"; import {BalanceDelta, BalanceDeltaLibrary} from "../types/BalanceDelta.sol"; diff --git a/src/test/Fuzzers.sol b/src/test/Fuzzers.sol index 5050cc36f..b524d88fa 100644 --- a/src/test/Fuzzers.sol +++ b/src/test/Fuzzers.sol @@ -4,7 +4,6 @@ pragma solidity ^0.8.24; import {Vm} from "forge-std/Vm.sol"; import {StdUtils} from "forge-std/StdUtils.sol"; -import {IPoolManager} from "../interfaces/IPoolManager.sol"; import {ModifyLiquidityParams} from "../types/PoolOperation.sol"; import {PoolKey} from "../types/PoolKey.sol"; import {BalanceDelta} from "../types/BalanceDelta.sol"; diff --git a/src/test/LPFeeTakingHook.sol b/src/test/LPFeeTakingHook.sol index 0c09861cf..8c99c306b 100644 --- a/src/test/LPFeeTakingHook.sol +++ b/src/test/LPFeeTakingHook.sol @@ -8,7 +8,6 @@ import {IPoolManager} from "../interfaces/IPoolManager.sol"; import {ModifyLiquidityParams} from "../types/PoolOperation.sol"; import {PoolKey} from "../types/PoolKey.sol"; import {BalanceDelta, toBalanceDelta} from "../types/BalanceDelta.sol"; -import {Currency} from "../types/Currency.sol"; import {BaseTestHooks} from "./BaseTestHooks.sol"; /// @notice a hook that takes all of the LP fee revenue diff --git a/src/test/MockHooks.sol b/src/test/MockHooks.sol index 185a91c09..f55e302ed 100644 --- a/src/test/MockHooks.sol +++ b/src/test/MockHooks.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.24; import {Hooks} from "../libraries/Hooks.sol"; import {IHooks} from "../interfaces/IHooks.sol"; -import {IPoolManager} from "../interfaces/IPoolManager.sol"; import {ModifyLiquidityParams, SwapParams} from "../types/PoolOperation.sol"; import {PoolKey} from "../types/PoolKey.sol"; import {BalanceDelta, BalanceDeltaLibrary} from "../types/BalanceDelta.sol"; diff --git a/src/test/PoolClaimsTest.sol b/src/test/PoolClaimsTest.sol index bb1e3f464..dba553be9 100644 --- a/src/test/PoolClaimsTest.sol +++ b/src/test/PoolClaimsTest.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.24; import {Currency} from "../types/Currency.sol"; -import {BalanceDelta} from "../types/BalanceDelta.sol"; import {IPoolManager} from "../interfaces/IPoolManager.sol"; import {PoolTestBase} from "./PoolTestBase.sol"; import {SafeCast} from "../libraries/SafeCast.sol"; diff --git a/src/test/ProtocolFeesImplementation.sol b/src/test/ProtocolFeesImplementation.sol index f26ac849e..7732bc839 100644 --- a/src/test/ProtocolFeesImplementation.sol +++ b/src/test/ProtocolFeesImplementation.sol @@ -6,7 +6,6 @@ import {PoolKey} from "../types/PoolKey.sol"; import {Currency} from "../types/Currency.sol"; import {PoolId} from "../types/PoolId.sol"; import {Pool} from "../libraries/Pool.sol"; -import {Slot0} from "../types/Slot0.sol"; contract ProtocolFeesImplementation is ProtocolFees { mapping(PoolId id => Pool.State) internal _pools; diff --git a/src/test/ProxyPoolManager.sol b/src/test/ProxyPoolManager.sol index bdf651fe3..16b9fa953 100644 --- a/src/test/ProxyPoolManager.sol +++ b/src/test/ProxyPoolManager.sol @@ -4,7 +4,6 @@ pragma solidity ^0.8.24; import {Hooks} from "../libraries/Hooks.sol"; import {Pool} from "../libraries/Pool.sol"; import {SafeCast} from "../libraries/SafeCast.sol"; -import {Position} from "../libraries/Position.sol"; import {LPFeeLibrary} from "../libraries/LPFeeLibrary.sol"; import {Currency} from "../types/Currency.sol"; import {PoolKey} from "../types/PoolKey.sol"; diff --git a/src/types/PoolOperation.sol b/src/types/PoolOperation.sol index 4982097db..62bf258c5 100644 --- a/src/types/PoolOperation.sol +++ b/src/types/PoolOperation.sol @@ -1,9 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.24; -import {PoolKey} from "../types/PoolKey.sol"; -import {BalanceDelta} from "../types/BalanceDelta.sol"; - /// @notice Parameter struct for `ModifyLiquidity` pool operations struct ModifyLiquidityParams { // the lower and upper tick of the position diff --git a/test/CustomAccounting.t.sol b/test/CustomAccounting.t.sol index 2c6d83b6c..8d4609acf 100644 --- a/test/CustomAccounting.t.sol +++ b/test/CustomAccounting.t.sol @@ -10,7 +10,6 @@ import {DeltaReturningHook} from "../src/test/DeltaReturningHook.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; import {Hooks} from "../src/libraries/Hooks.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; -import {PoolId} from "../src/types/PoolId.sol"; import {SwapParams} from "../src/types/PoolOperation.sol"; import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; import {Currency} from "../src/types/Currency.sol"; diff --git a/test/DynamicFees.t.sol b/test/DynamicFees.t.sol index ba9b1973e..a4d5cf916 100644 --- a/test/DynamicFees.t.sol +++ b/test/DynamicFees.t.sol @@ -2,23 +2,18 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {PoolId} from "../src/types/PoolId.sol"; import {Hooks} from "../src/libraries/Hooks.sol"; import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol"; import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; -import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; import {PoolKey} from "../src/types/PoolKey.sol"; import {SwapParams} from "../src/types/PoolOperation.sol"; -import {PoolManager} from "../src/PoolManager.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; import {Deployers} from "./utils/Deployers.sol"; import {DynamicFeesTestHook} from "../src/test/DynamicFeesTestHook.sol"; -import {Currency} from "../src/types/Currency.sol"; -import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; import {Pool} from "../src/libraries/Pool.sol"; -import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol"; +import {BalanceDelta} from "../src/types/BalanceDelta.sol"; import {StateLibrary} from "../src/libraries/StateLibrary.sol"; import {CustomRevert} from "../src/libraries/CustomRevert.sol"; import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol"; diff --git a/test/DynamicReturnFees.t.sol b/test/DynamicReturnFees.t.sol index 0f157fbfa..64ead6064 100644 --- a/test/DynamicReturnFees.t.sol +++ b/test/DynamicReturnFees.t.sol @@ -2,20 +2,15 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {PoolId} from "../src/types/PoolId.sol"; import {Hooks} from "../src/libraries/Hooks.sol"; import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol"; import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; -import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; import {PoolKey} from "../src/types/PoolKey.sol"; -import {PoolManager} from "../src/PoolManager.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; import {Deployers} from "./utils/Deployers.sol"; import {DynamicReturnFeeTestHook} from "../src/test/DynamicReturnFeeTestHook.sol"; -import {Currency} from "../src/types/Currency.sol"; -import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; import {FullMath} from "../src/libraries/FullMath.sol"; import {BalanceDelta} from "../src/types/BalanceDelta.sol"; import {StateLibrary} from "../src/libraries/StateLibrary.sol"; diff --git a/test/ERC6909Claims.t.sol b/test/ERC6909Claims.t.sol index 16e76c9f0..c7a96fc2a 100644 --- a/test/ERC6909Claims.t.sol +++ b/test/ERC6909Claims.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.15; import {Test} from "forge-std/Test.sol"; -import {Currency} from "../src/types/Currency.sol"; import {MockERC6909Claims} from "../src/test/MockERC6909Claims.sol"; contract ERC6909ClaimsTest is Test { diff --git a/test/ModifyLiquidity.t.sol b/test/ModifyLiquidity.t.sol index 5e07f99bb..88a263e4a 100644 --- a/test/ModifyLiquidity.t.sol +++ b/test/ModifyLiquidity.t.sol @@ -7,7 +7,6 @@ import {PoolKey} from "src/types/PoolKey.sol"; import {ModifyLiquidityParams} from "src/types/PoolOperation.sol"; import {IPoolManager} from "src/interfaces/IPoolManager.sol"; import {IHooks} from "src/interfaces/IHooks.sol"; -import {Position} from "src/libraries/Position.sol"; import {PoolId} from "src/types/PoolId.sol"; import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol"; import {Constants} from "./utils/Constants.sol"; @@ -18,7 +17,6 @@ import {JavascriptFfi} from "./utils/JavascriptFfi.sol"; import {BalanceDelta} from "../src/types/BalanceDelta.sol"; import {Fuzzers} from "../src/test/Fuzzers.sol"; import {TickMath} from "src/libraries/TickMath.sol"; -import {toBalanceDelta} from "src/types/BalanceDelta.sol"; import {Logger} from "./utils/Logger.sol"; contract ModifyLiquidityTest is Test, Logger, Deployers, JavascriptFfi, Fuzzers { diff --git a/test/PoolManager.clear.t.sol b/test/PoolManager.clear.t.sol index f1c8b6394..f04753283 100644 --- a/test/PoolManager.clear.t.sol +++ b/test/PoolManager.clear.t.sol @@ -6,8 +6,6 @@ import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; import {Deployers} from "./utils/Deployers.sol"; import {Actions} from "../src/test/ActionsRouter.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; -import {MockERC20} from "forge-std/mocks/MockERC20.sol"; -import {Currency} from "../src/types/Currency.sol"; contract ClearTest is Test, Deployers { function setUp() public { diff --git a/test/PoolManager.swap.t.sol b/test/PoolManager.swap.t.sol index 606d1bc01..ac4ed9a7b 100644 --- a/test/PoolManager.swap.t.sol +++ b/test/PoolManager.swap.t.sol @@ -7,15 +7,11 @@ import {Deployers} from "./utils/Deployers.sol"; import {Currency} from "../src/types/Currency.sol"; import {Fuzzers} from "../src/test/Fuzzers.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; -import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; -import {BalanceDelta, BalanceDeltaLibrary, toBalanceDelta} from "../src/types/BalanceDelta.sol"; +import {BalanceDelta, toBalanceDelta} from "../src/types/BalanceDelta.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; import {PoolKey} from "../src/types/PoolKey.sol"; import {ModifyLiquidityParams, SwapParams} from "../src/types/PoolOperation.sol"; -import {SqrtPriceMath} from "../src/libraries/SqrtPriceMath.sol"; -import {TickMath} from "../src/libraries/TickMath.sol"; import {SafeCast} from "../src/libraries/SafeCast.sol"; -import {LiquidityAmounts} from "./utils/LiquidityAmounts.sol"; abstract contract V3Fuzzer is V3Helper, Deployers, Fuzzers, IUniswapV3MintCallback, IUniswapV3SwapCallback { function setUp() public virtual override { diff --git a/test/PoolManager.t.sol b/test/PoolManager.t.sol index 3c6fcd605..1547c0c0d 100644 --- a/test/PoolManager.t.sol +++ b/test/PoolManager.t.sol @@ -13,10 +13,7 @@ import {Deployers} from "./utils/Deployers.sol"; import {Currency, CurrencyLibrary} from "../src/types/Currency.sol"; import {MockHooks} from "../src/test/MockHooks.sol"; import {MockContract} from "../src/test/MockContract.sol"; -import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol"; -import {PoolKey} from "../src/types/PoolKey.sol"; import {ModifyLiquidityParams, SwapParams} from "../src/types/PoolOperation.sol"; -import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol"; import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; import {TestInvalidERC20} from "../src/test/TestInvalidERC20.sol"; @@ -24,10 +21,8 @@ import {PoolEmptyUnlockTest} from "../src/test/PoolEmptyUnlockTest.sol"; import {Action} from "../src/test/PoolNestedActionsTest.sol"; import {PoolId} from "../src/types/PoolId.sol"; import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol"; -import {Position} from "../src/libraries/Position.sol"; import {Constants} from "./utils/Constants.sol"; import {SafeCast} from "../src/libraries/SafeCast.sol"; -import {AmountHelpers} from "./utils/AmountHelpers.sol"; import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol"; import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol"; import {StateLibrary} from "../src/libraries/StateLibrary.sol"; diff --git a/test/PoolManagerInitialize.t.sol b/test/PoolManagerInitialize.t.sol index 8ec018756..a5f8d285d 100644 --- a/test/PoolManagerInitialize.t.sol +++ b/test/PoolManagerInitialize.t.sol @@ -5,8 +5,6 @@ import {Test} from "forge-std/Test.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; import {Hooks} from "../src/libraries/Hooks.sol"; import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; -import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol"; -import {PoolManager} from "../src/PoolManager.sol"; import {TickMath} from "../src/libraries/TickMath.sol"; import {Pool} from "../src/libraries/Pool.sol"; import {Deployers} from "./utils/Deployers.sol"; @@ -14,7 +12,6 @@ import {Constants} from "./utils/Constants.sol"; import {Currency, CurrencyLibrary} from "../src/types/Currency.sol"; import {MockHooks} from "../src/test/MockHooks.sol"; import {MockContract} from "../src/test/MockContract.sol"; -import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol"; import {PoolKey} from "../src/types/PoolKey.sol"; import {PoolId} from "../src/types/PoolId.sol"; import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol"; diff --git a/test/SkipCallsTestHook.t.sol b/test/SkipCallsTestHook.t.sol index a1a139c4f..d70dca474 100644 --- a/test/SkipCallsTestHook.t.sol +++ b/test/SkipCallsTestHook.t.sol @@ -2,14 +2,9 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; -import {PoolId} from "../src/types/PoolId.sol"; import {Hooks} from "../src/libraries/Hooks.sol"; import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; -import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol"; import {IHooks} from "../src/interfaces/IHooks.sol"; -import {PoolKey} from "../src/types/PoolKey.sol"; -import {PoolManager} from "../src/PoolManager.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; import {Deployers} from "./utils/Deployers.sol"; import {Currency} from "../src/types/Currency.sol"; diff --git a/test/Sync.t.sol b/test/Sync.t.sol index a6655da58..4d3e4a139 100644 --- a/test/Sync.t.sol +++ b/test/Sync.t.sol @@ -9,12 +9,9 @@ import {IHooks} from "../src/interfaces/IHooks.sol"; import {Currency} from "../src/types/Currency.sol"; import {IPoolManager} from "../src/interfaces/IPoolManager.sol"; import {PoolSwapTest} from "../src/test/PoolSwapTest.sol"; -import {IUnlockCallback} from "../src/interfaces/callback/IUnlockCallback.sol"; import {PoolKey} from "../src/types/PoolKey.sol"; import {ModifyLiquidityParams} from "../src/types/PoolOperation.sol"; -import {ActionsRouter, Actions} from "../src/test/ActionsRouter.sol"; -import {SafeCast} from "../src/libraries/SafeCast.sol"; -import {CurrencyReserves} from "../src/libraries/CurrencyReserves.sol"; +import {Actions} from "../src/test/ActionsRouter.sol"; import {StateLibrary} from "../src/libraries/StateLibrary.sol"; import {TransientStateLibrary} from "../src/libraries/TransientStateLibrary.sol"; import {NativeERC20} from "../src/test/NativeERC20.sol"; diff --git a/test/libraries/Hooks.t.sol b/test/libraries/Hooks.t.sol index ff65539a6..832460982 100644 --- a/test/libraries/Hooks.t.sol +++ b/test/libraries/Hooks.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {Hooks} from "../../src/libraries/Hooks.sol"; import {LPFeeLibrary} from "../../src/libraries/LPFeeLibrary.sol"; import {MockHooks} from "../../src/test/MockHooks.sol"; @@ -10,16 +9,10 @@ import {IPoolManager} from "../../src/interfaces/IPoolManager.sol"; import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; import {IHooks} from "../../src/interfaces/IHooks.sol"; import {Currency} from "../../src/types/Currency.sol"; -import {PoolManager} from "../../src/PoolManager.sol"; import {PoolSwapTest} from "../../src/test/PoolSwapTest.sol"; -import {PoolDonateTest} from "../../src/test/PoolDonateTest.sol"; import {Deployers} from "test/utils/Deployers.sol"; -import {ProtocolFees} from "../../src/ProtocolFees.sol"; -import {PoolId} from "../../src/types/PoolId.sol"; import {PoolKey} from "../../src/types/PoolKey.sol"; import {ModifyLiquidityParams, SwapParams} from "../../src/types/PoolOperation.sol"; -import {IERC20Minimal} from "../../src/interfaces/external/IERC20Minimal.sol"; -import {BalanceDelta} from "../../src/types/BalanceDelta.sol"; import {BaseTestHooks} from "../../src/test/BaseTestHooks.sol"; import {EmptyRevertContract} from "../../src/test/EmptyRevertContract.sol"; import {StateLibrary} from "../../src/libraries/StateLibrary.sol"; diff --git a/test/libraries/Pool.t.sol b/test/libraries/Pool.t.sol index e93e9f1df..412dc00a9 100644 --- a/test/libraries/Pool.t.sol +++ b/test/libraries/Pool.t.sol @@ -2,15 +2,12 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {Pool} from "../../src/libraries/Pool.sol"; -import {PoolManager} from "../../src/PoolManager.sol"; import {Position} from "../../src/libraries/Position.sol"; import {TickMath} from "../../src/libraries/TickMath.sol"; import {TickBitmap} from "../../src/libraries/TickBitmap.sol"; import {LiquidityAmounts} from "../../test/utils/LiquidityAmounts.sol"; import {Constants} from "../../test/utils/Constants.sol"; -import {BalanceDelta} from "../../src/types/BalanceDelta.sol"; import {Slot0} from "../../src/types/Slot0.sol"; import {SafeCast} from "../../src/libraries/SafeCast.sol"; import {ProtocolFeeLibrary} from "../../src/libraries/ProtocolFeeLibrary.sol"; diff --git a/test/libraries/SafeCast.t.sol b/test/libraries/SafeCast.t.sol index 2b725e9bb..d8d8c5174 100644 --- a/test/libraries/SafeCast.t.sol +++ b/test/libraries/SafeCast.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {SafeCast} from "../../src/libraries/SafeCast.sol"; contract SafeCastTest is Test { diff --git a/test/libraries/SqrtPriceMath.t.sol b/test/libraries/SqrtPriceMath.t.sol index b916e345a..df7dab950 100644 --- a/test/libraries/SqrtPriceMath.t.sol +++ b/test/libraries/SqrtPriceMath.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {SqrtPriceMath} from "../../src/libraries/SqrtPriceMath.sol"; import {Constants} from "../../test/utils/Constants.sol"; diff --git a/test/libraries/StateLibrary.t.sol b/test/libraries/StateLibrary.t.sol index a67f921c0..e74fb7c7a 100644 --- a/test/libraries/StateLibrary.t.sol +++ b/test/libraries/StateLibrary.t.sol @@ -3,17 +3,13 @@ pragma solidity ^0.8.19; import "forge-std/Test.sol"; import {IHooks} from "../../src/interfaces/IHooks.sol"; -import {Hooks} from "../../src/libraries/Hooks.sol"; import {TickMath} from "../../src/libraries/TickMath.sol"; -import {IPoolManager} from "../../src/interfaces/IPoolManager.sol"; import {ModifyLiquidityParams} from "../../src/types/PoolOperation.sol"; import {PoolKey} from "../../src/types/PoolKey.sol"; import {BalanceDelta} from "../../src/types/BalanceDelta.sol"; import {PoolId} from "../../src/types/PoolId.sol"; -import {Currency} from "../../src/types/Currency.sol"; import {Deployers} from "../utils/Deployers.sol"; import {FixedPointMathLib} from "solmate/src/utils/FixedPointMathLib.sol"; -import {Pool} from "../../src/libraries/Pool.sol"; import {TickBitmap} from "../../src/libraries/TickBitmap.sol"; import {FixedPoint128} from "../../src/libraries/FixedPoint128.sol"; diff --git a/test/libraries/SwapMath.t.sol b/test/libraries/SwapMath.t.sol index 4f70ef0a0..0991a73dd 100644 --- a/test/libraries/SwapMath.t.sol +++ b/test/libraries/SwapMath.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {SqrtPriceMath} from "../../src/libraries/SqrtPriceMath.sol"; import {SwapMath} from "../../src/libraries/SwapMath.sol"; import {Constants} from "../utils/Constants.sol"; diff --git a/test/libraries/TickBitmap.t.sol b/test/libraries/TickBitmap.t.sol index a79f13d44..e6d7e8331 100644 --- a/test/libraries/TickBitmap.t.sol +++ b/test/libraries/TickBitmap.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {TickBitmap} from "../../src/libraries/TickBitmap.sol"; import {TickMath} from "../../src/libraries/TickMath.sol"; diff --git a/test/libraries/TickMath.t.sol b/test/libraries/TickMath.t.sol index 5ad9212dd..b2b704e0d 100644 --- a/test/libraries/TickMath.t.sol +++ b/test/libraries/TickMath.t.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {TickMathTest} from "src/test/TickMathTest.sol"; import {TickMath} from "src/libraries/TickMath.sol"; import {JavascriptFfi} from "test/utils/JavascriptFfi.sol"; diff --git a/test/utils/Deployers.sol b/test/utils/Deployers.sol index c0ddadd05..07b08e34a 100644 --- a/test/utils/Deployers.sol +++ b/test/utils/Deployers.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.20; import "forge-std/Test.sol"; import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; -import {Hooks} from "../../src/libraries/Hooks.sol"; import {Currency, CurrencyLibrary} from "../../src/types/Currency.sol"; import {IHooks} from "../../src/interfaces/IHooks.sol"; import {IPoolManager} from "../../src/interfaces/IPoolManager.sol"; diff --git a/test/utils/SwapHelper.t.sol b/test/utils/SwapHelper.t.sol index a6dd00533..be628fbc1 100644 --- a/test/utils/SwapHelper.t.sol +++ b/test/utils/SwapHelper.t.sol @@ -2,21 +2,10 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {Vm} from "forge-std/Vm.sol"; import {Hooks} from "../../src/libraries/Hooks.sol"; import {MockHooks} from "../../src/test/MockHooks.sol"; -import {IPoolManager} from "../../src/interfaces/IPoolManager.sol"; -import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol"; import {IHooks} from "../../src/interfaces/IHooks.sol"; -import {Currency} from "../../src/types/Currency.sol"; -import {PoolManager} from "../../src/PoolManager.sol"; -import {PoolSwapTest} from "../../src/test/PoolSwapTest.sol"; -import {PoolDonateTest} from "../../src/test/PoolDonateTest.sol"; import {Deployers} from "./Deployers.sol"; -import {ProtocolFees} from "../../src/ProtocolFees.sol"; -import {PoolId} from "../../src/types/PoolId.sol"; -import {PoolKey} from "../../src/types/PoolKey.sol"; -import {IERC20Minimal} from "../../src/interfaces/external/IERC20Minimal.sol"; import {BalanceDelta} from "../../src/types/BalanceDelta.sol"; import {Constants} from "../utils/Constants.sol";