Skip to content

Commit 4d3ef8c

Browse files
gkfyrgkfyr
committed
refactor: reorder and deduplicate test imports
1 parent 80311e3 commit 4d3ef8c

13 files changed

+107
-111
lines changed

‎test/CurrencyReserves.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: UNLICENSED
22
pragma solidity ^0.8.20;
33

4-
import {CurrencyReserves} from "../src/libraries/CurrencyReserves.sol";
54
import {Test} from "forge-std/Test.sol";
65
import {Currency} from "../src/types/Currency.sol";
6+
import {CurrencyReserves} from "../src/libraries/CurrencyReserves.sol";
77

88
contract CurrencyReservesTest is Test {
99
using CurrencyReserves for Currency;

‎test/CustomAccounting.t.sol‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
55
import {Deployers} from "./utils/Deployers.sol";
6-
import {FeeTakingHook} from "../src/test/FeeTakingHook.sol";
7-
import {LPFeeTakingHook} from "../src/test/LPFeeTakingHook.sol";
8-
import {CustomCurveHook} from "../src/test/CustomCurveHook.sol";
9-
import {DeltaReturningHook} from "../src/test/DeltaReturningHook.sol";
10-
import {IHooks} from "../src/interfaces/IHooks.sol";
11-
import {Hooks} from "../src/libraries/Hooks.sol";
12-
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
136
import {PoolId} from "../src/types/PoolId.sol";
14-
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
157
import {Currency} from "../src/types/Currency.sol";
168
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
9+
import {IHooks} from "../src/interfaces/IHooks.sol";
10+
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
11+
import {Hooks} from "../src/libraries/Hooks.sol";
1712
import {SafeCast} from "../src/libraries/SafeCast.sol";
13+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
14+
import {FeeTakingHook} from "../src/test/FeeTakingHook.sol";
15+
import {LPFeeTakingHook} from "../src/test/LPFeeTakingHook.sol";
16+
import {CustomCurveHook} from "../src/test/CustomCurveHook.sol";
17+
import {DeltaReturningHook} from "../src/test/DeltaReturningHook.sol";
1818

1919
contract CustomAccountingTest is Test, Deployers {
2020
using SafeCast for *;

‎test/DynamicFees.t.sol‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
55
import {Vm} from "forge-std/Vm.sol";
6+
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
7+
import {Deployers} from "./utils/Deployers.sol";
68
import {PoolId} from "../src/types/PoolId.sol";
7-
import {Hooks} from "../src/libraries/Hooks.sol";
8-
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
9-
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
10-
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
11-
import {IHooks} from "../src/interfaces/IHooks.sol";
129
import {PoolKey} from "../src/types/PoolKey.sol";
13-
import {PoolManager} from "../src/PoolManager.sol";
14-
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
15-
import {Deployers} from "./utils/Deployers.sol";
16-
import {DynamicFeesTestHook} from "../src/test/DynamicFeesTestHook.sol";
1710
import {Currency} from "../src/types/Currency.sol";
18-
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
19-
import {Pool} from "../src/libraries/Pool.sol";
2011
import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol";
21-
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
12+
import {IHooks} from "../src/interfaces/IHooks.sol";
13+
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
14+
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
15+
import {Pool} from "../src/libraries/Pool.sol";
16+
import {Hooks} from "../src/libraries/Hooks.sol";
2217
import {CustomRevert} from "../src/libraries/CustomRevert.sol";
18+
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
19+
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
2320
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
21+
import {PoolManager} from "../src/PoolManager.sol";
22+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
23+
import {DynamicFeesTestHook} from "../src/test/DynamicFeesTestHook.sol";
2424

2525
contract TestDynamicFees is Test, Deployers {
2626
using StateLibrary for IPoolManager;

‎test/DynamicReturnFees.t.sol‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
55
import {Vm} from "forge-std/Vm.sol";
6+
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
7+
import {Deployers} from "./utils/Deployers.sol";
68
import {PoolId} from "../src/types/PoolId.sol";
7-
import {Hooks} from "../src/libraries/Hooks.sol";
8-
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
9+
import {PoolKey} from "../src/types/PoolKey.sol";
10+
import {Currency} from "../src/types/Currency.sol";
11+
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
12+
import {IHooks} from "../src/interfaces/IHooks.sol";
913
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1014
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
11-
import {IHooks} from "../src/interfaces/IHooks.sol";
12-
import {PoolKey} from "../src/types/PoolKey.sol";
15+
import {Hooks} from "../src/libraries/Hooks.sol";
16+
import {FullMath} from "../src/libraries/FullMath.sol";
17+
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
18+
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
1319
import {PoolManager} from "../src/PoolManager.sol";
1420
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
15-
import {Deployers} from "./utils/Deployers.sol";
1621
import {DynamicReturnFeeTestHook} from "../src/test/DynamicReturnFeeTestHook.sol";
17-
import {Currency} from "../src/types/Currency.sol";
18-
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
19-
import {FullMath} from "../src/libraries/FullMath.sol";
20-
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
21-
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
2222

2323
contract TestDynamicReturnFees is Test, Deployers {
2424
using StateLibrary for IPoolManager;

‎test/ModifyLiquidity.t.sol‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
5+
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
6+
import {Logger} from "./utils/Logger.sol";
57
import {Deployers} from "./utils/Deployers.sol";
8+
import {Constants} from "./utils/Constants.sol";
9+
import {JavascriptFfi} from "./utils/JavascriptFfi.sol";
10+
import {PoolId} from "src/types/PoolId.sol";
611
import {PoolKey} from "src/types/PoolKey.sol";
7-
import {IPoolManager} from "src/interfaces/IPoolManager.sol";
12+
import {Currency} from "src/types/Currency.sol";
13+
import {toBalanceDelta} from "src/types/BalanceDelta.sol";
14+
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
815
import {IHooks} from "src/interfaces/IHooks.sol";
16+
import {IPoolManager} from "src/interfaces/IPoolManager.sol";
917
import {Position} from "src/libraries/Position.sol";
10-
import {PoolId} from "src/types/PoolId.sol";
11-
import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol";
12-
import {Constants} from "./utils/Constants.sol";
13-
import {Currency} from "src/types/Currency.sol";
14-
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
18+
import {TickMath} from "src/libraries/TickMath.sol";
1519
import {StateLibrary} from "src/libraries/StateLibrary.sol";
16-
import {JavascriptFfi} from "./utils/JavascriptFfi.sol";
17-
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
1820
import {Fuzzers} from "../src/test/Fuzzers.sol";
19-
import {TickMath} from "src/libraries/TickMath.sol";
20-
import {toBalanceDelta} from "src/types/BalanceDelta.sol";
21-
import {Logger} from "./utils/Logger.sol";
21+
import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol";
2222

2323
contract ModifyLiquidityTest is Test, Logger, Deployers, JavascriptFfi, Fuzzers {
2424
using StateLibrary for IPoolManager;

‎test/NoDelegateCall.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
5+
import {Deployers} from "./utils/Deployers.sol";
56
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
7+
import {PoolManager} from "../src/PoolManager.sol";
8+
import {NoDelegateCall} from "../src/NoDelegateCall.sol";
69
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
710
import {ProxyPoolManager} from "../src/test/ProxyPoolManager.sol";
811
import {NoDelegateCallTest} from "../src/test/NoDelegateCallTest.sol";
9-
import {PoolManager} from "../src/PoolManager.sol";
10-
import {NoDelegateCall} from "../src/NoDelegateCall.sol";
11-
import {Deployers} from "./utils/Deployers.sol";
1212

1313
contract TestDelegateCall is Test, Deployers {
1414
// override to use ProxyPoolManager

‎test/PoolManager.clear.t.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
pragma solidity ^0.8.0;
33

44
import "forge-std/Test.sol";
5-
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
6-
import {Deployers} from "./utils/Deployers.sol";
7-
import {Actions} from "../src/test/ActionsRouter.sol";
8-
import {IHooks} from "../src/interfaces/IHooks.sol";
95
import {MockERC20} from "forge-std/mocks/MockERC20.sol";
6+
import {Deployers} from "./utils/Deployers.sol";
107
import {Currency} from "../src/types/Currency.sol";
8+
import {IHooks} from "../src/interfaces/IHooks.sol";
9+
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
10+
import {Actions} from "../src/test/ActionsRouter.sol";
1111

1212
contract ClearTest is Test, Deployers {
1313
function setUp() public {

‎test/PoolManager.swap.t.sol‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
pragma solidity ^0.8.24;
33

44
import "forge-std/Test.sol";
5-
import {V3Helper, IUniswapV3Pool, IUniswapV3MintCallback, IUniswapV3SwapCallback} from "./utils/V3Helper.sol";
65
import {Deployers} from "./utils/Deployers.sol";
6+
import {LiquidityAmounts} from "./utils/LiquidityAmounts.sol";
7+
import {V3Helper, IUniswapV3Pool, IUniswapV3MintCallback, IUniswapV3SwapCallback} from "./utils/V3Helper.sol";
8+
import {PoolKey} from "../src/types/PoolKey.sol";
79
import {Currency} from "../src/types/Currency.sol";
8-
import {Fuzzers} from "../src/test/Fuzzers.sol";
10+
import {BalanceDelta, BalanceDeltaLibrary, toBalanceDelta} from "../src/types/BalanceDelta.sol";
911
import {IHooks} from "../src/interfaces/IHooks.sol";
1012
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
11-
import {BalanceDelta, BalanceDeltaLibrary, toBalanceDelta} from "../src/types/BalanceDelta.sol";
12-
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
13-
import {PoolKey} from "../src/types/PoolKey.sol";
14-
import {SqrtPriceMath} from "../src/libraries/SqrtPriceMath.sol";
1513
import {TickMath} from "../src/libraries/TickMath.sol";
1614
import {SafeCast} from "../src/libraries/SafeCast.sol";
17-
import {LiquidityAmounts} from "./utils/LiquidityAmounts.sol";
15+
import {SqrtPriceMath} from "../src/libraries/SqrtPriceMath.sol";
16+
import {Fuzzers} from "../src/test/Fuzzers.sol";
17+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
1818

1919
abstract contract V3Fuzzer is V3Helper, Deployers, Fuzzers, IUniswapV3MintCallback, IUniswapV3SwapCallback {
2020
function setUp() public virtual override {

‎test/PoolManager.t.sol‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,36 @@
22
pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
5+
import {Deployers} from "./utils/Deployers.sol";
6+
import {Constants} from "./utils/Constants.sol";
7+
import {AmountHelpers} from "./utils/AmountHelpers.sol";
8+
import {PoolId} from "../src/types/PoolId.sol";
9+
import {PoolKey} from "../src/types/PoolKey.sol";
10+
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
11+
import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol";
512
import {IHooks} from "../src/interfaces/IHooks.sol";
6-
import {Hooks} from "../src/libraries/Hooks.sol";
713
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
814
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
9-
import {PoolManager} from "../src/PoolManager.sol";
10-
import {TickMath} from "../src/libraries/TickMath.sol";
1115
import {Pool} from "../src/libraries/Pool.sol";
12-
import {Deployers} from "./utils/Deployers.sol";
13-
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
14-
import {MockHooks} from "../src/test/MockHooks.sol";
15-
import {MockContract} from "../src/test/MockContract.sol";
16-
import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol";
17-
import {PoolKey} from "../src/types/PoolKey.sol";
18-
import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol";
19-
import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol";
20-
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
21-
import {TestInvalidERC20} from "../src/test/TestInvalidERC20.sol";
22-
import {PoolEmptyUnlockTest} from "../src/test/PoolEmptyUnlockTest.sol";
23-
import {Action} from "../src/test/PoolNestedActionsTest.sol";
24-
import {PoolId} from "../src/types/PoolId.sol";
25-
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
16+
import {Hooks} from "../src/libraries/Hooks.sol";
17+
import {TickMath} from "../src/libraries/TickMath.sol";
2618
import {Position} from "../src/libraries/Position.sol";
27-
import {Constants} from "./utils/Constants.sol";
2819
import {SafeCast} from "../src/libraries/SafeCast.sol";
29-
import {AmountHelpers} from "./utils/AmountHelpers.sol";
30-
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
31-
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
20+
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
3221
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
22+
import {CustomRevert} from "../src/libraries/CustomRevert.sol";
23+
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
3324
import {TransientStateLibrary} from "../src/libraries/TransientStateLibrary.sol";
25+
import {PoolManager} from "../src/PoolManager.sol";
26+
import {Action} from "../src/test/PoolNestedActionsTest.sol";
3427
import {Actions} from "../src/test/ActionsRouter.sol";
35-
import {CustomRevert} from "../src/libraries/CustomRevert.sol";
28+
import {MockHooks} from "../src/test/MockHooks.sol";
29+
import {MockContract} from "../src/test/MockContract.sol";
30+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
31+
import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol";
32+
import {TestInvalidERC20} from "../src/test/TestInvalidERC20.sol";
33+
import {PoolEmptyUnlockTest} from "../src/test/PoolEmptyUnlockTest.sol";
34+
import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol";
3635

3736
contract PoolManagerTest is Test, Deployers {
3837
using Hooks for IHooks;

‎test/PoolManagerInitialize.t.sol‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/Test.sol";
5+
import {Deployers} from "./utils/Deployers.sol";
6+
import {Constants} from "./utils/Constants.sol";
7+
import {PoolId} from "../src/types/PoolId.sol";
8+
import {PoolKey} from "../src/types/PoolKey.sol";
9+
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
510
import {IHooks} from "../src/interfaces/IHooks.sol";
6-
import {Hooks} from "../src/libraries/Hooks.sol";
711
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
812
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
9-
import {PoolManager} from "../src/PoolManager.sol";
10-
import {TickMath} from "../src/libraries/TickMath.sol";
1113
import {Pool} from "../src/libraries/Pool.sol";
12-
import {Deployers} from "./utils/Deployers.sol";
13-
import {Constants} from "./utils/Constants.sol";
14-
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
14+
import {Hooks} from "../src/libraries/Hooks.sol";
15+
import {TickMath} from "../src/libraries/TickMath.sol";
16+
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
17+
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
18+
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
19+
import {PoolManager} from "../src/PoolManager.sol";
1520
import {MockHooks} from "../src/test/MockHooks.sol";
1621
import {MockContract} from "../src/test/MockContract.sol";
1722
import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol";
18-
import {PoolKey} from "../src/types/PoolKey.sol";
19-
import {PoolId} from "../src/types/PoolId.sol";
20-
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
21-
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
22-
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
2323

2424
contract PoolManagerInitializeTest is Test, Deployers {
2525
using Hooks for IHooks;

0 commit comments

Comments
 (0)