Skip to content

Commit 08660e5

Browse files
gkfyrgkfyr
committed
refactor: reorder imports alphabetically
1 parent 4d3ef8c commit 08660e5

11 files changed

+52
-53
lines changed

‎test/CustomAccounting.t.sol‎

Lines changed: 5 additions & 5 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 {PoolId} from "../src/types/PoolId.sol";
7-
import {Currency} from "../src/types/Currency.sol";
86
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
7+
import {Currency} from "../src/types/Currency.sol";
8+
import {PoolId} from "../src/types/PoolId.sol";
99
import {IHooks} from "../src/interfaces/IHooks.sol";
1010
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1111
import {Hooks} from "../src/libraries/Hooks.sol";
1212
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";
1613
import {CustomCurveHook} from "../src/test/CustomCurveHook.sol";
1714
import {DeltaReturningHook} from "../src/test/DeltaReturningHook.sol";
15+
import {FeeTakingHook} from "../src/test/FeeTakingHook.sol";
16+
import {LPFeeTakingHook} from "../src/test/LPFeeTakingHook.sol";
17+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
1818

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

‎test/DynamicFees.t.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ import {Test} from "forge-std/Test.sol";
55
import {Vm} from "forge-std/Vm.sol";
66
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
77
import {Deployers} from "./utils/Deployers.sol";
8+
import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol";
9+
import {Currency} from "../src/types/Currency.sol";
810
import {PoolId} from "../src/types/PoolId.sol";
911
import {PoolKey} from "../src/types/PoolKey.sol";
10-
import {Currency} from "../src/types/Currency.sol";
11-
import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol";
1212
import {IHooks} from "../src/interfaces/IHooks.sol";
1313
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1414
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
15-
import {Pool} from "../src/libraries/Pool.sol";
16-
import {Hooks} from "../src/libraries/Hooks.sol";
1715
import {CustomRevert} from "../src/libraries/CustomRevert.sol";
18-
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
16+
import {Hooks} from "../src/libraries/Hooks.sol";
1917
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
18+
import {Pool} from "../src/libraries/Pool.sol";
2019
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
20+
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
2121
import {PoolManager} from "../src/PoolManager.sol";
22-
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
2322
import {DynamicFeesTestHook} from "../src/test/DynamicFeesTestHook.sol";
23+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
2424

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

‎test/DynamicReturnFees.t.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import {Test} from "forge-std/Test.sol";
55
import {Vm} from "forge-std/Vm.sol";
66
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
77
import {Deployers} from "./utils/Deployers.sol";
8+
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
9+
import {Currency} from "../src/types/Currency.sol";
810
import {PoolId} from "../src/types/PoolId.sol";
911
import {PoolKey} from "../src/types/PoolKey.sol";
10-
import {Currency} from "../src/types/Currency.sol";
11-
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
1212
import {IHooks} from "../src/interfaces/IHooks.sol";
1313
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1414
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
15-
import {Hooks} from "../src/libraries/Hooks.sol";
1615
import {FullMath} from "../src/libraries/FullMath.sol";
16+
import {Hooks} from "../src/libraries/Hooks.sol";
1717
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
1818
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
1919
import {PoolManager} from "../src/PoolManager.sol";
20-
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
2120
import {DynamicReturnFeeTestHook} from "../src/test/DynamicReturnFeeTestHook.sol";
21+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
2222

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

‎test/ModifyLiquidity.t.sol‎

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

44
import {Test} from "forge-std/Test.sol";
55
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
6-
import {Logger} from "./utils/Logger.sol";
7-
import {Deployers} from "./utils/Deployers.sol";
86
import {Constants} from "./utils/Constants.sol";
7+
import {Deployers} from "./utils/Deployers.sol";
98
import {JavascriptFfi} from "./utils/JavascriptFfi.sol";
9+
import {Logger} from "./utils/Logger.sol";
10+
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
11+
import {Currency} from "src/types/Currency.sol";
1012
import {PoolId} from "src/types/PoolId.sol";
1113
import {PoolKey} from "src/types/PoolKey.sol";
12-
import {Currency} from "src/types/Currency.sol";
1314
import {toBalanceDelta} from "src/types/BalanceDelta.sol";
14-
import {BalanceDelta} from "../src/types/BalanceDelta.sol";
1515
import {IHooks} from "src/interfaces/IHooks.sol";
1616
import {IPoolManager} from "src/interfaces/IPoolManager.sol";
1717
import {Position} from "src/libraries/Position.sol";
18-
import {TickMath} from "src/libraries/TickMath.sol";
1918
import {StateLibrary} from "src/libraries/StateLibrary.sol";
19+
import {TickMath} from "src/libraries/TickMath.sol";
2020
import {Fuzzers} from "../src/test/Fuzzers.sol";
2121
import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol";
2222

‎test/NoDelegateCall.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ pragma solidity ^0.8.20;
44
import {Test} from "forge-std/Test.sol";
55
import {Deployers} from "./utils/Deployers.sol";
66
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
7-
import {PoolManager} from "../src/PoolManager.sol";
87
import {NoDelegateCall} from "../src/NoDelegateCall.sol";
8+
import {PoolManager} from "../src/PoolManager.sol";
9+
import {NoDelegateCallTest} from "../src/test/NoDelegateCallTest.sol";
910
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
1011
import {ProxyPoolManager} from "../src/test/ProxyPoolManager.sol";
11-
import {NoDelegateCallTest} from "../src/test/NoDelegateCallTest.sol";
1212

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

‎test/PoolManager.swap.t.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ pragma solidity ^0.8.24;
44
import "forge-std/Test.sol";
55
import {Deployers} from "./utils/Deployers.sol";
66
import {LiquidityAmounts} from "./utils/LiquidityAmounts.sol";
7-
import {V3Helper, IUniswapV3Pool, IUniswapV3MintCallback, IUniswapV3SwapCallback} from "./utils/V3Helper.sol";
8-
import {PoolKey} from "../src/types/PoolKey.sol";
9-
import {Currency} from "../src/types/Currency.sol";
7+
import {IUniswapV3MintCallback, IUniswapV3Pool, IUniswapV3SwapCallback, V3Helper} from "./utils/V3Helper.sol";
108
import {BalanceDelta, BalanceDeltaLibrary, toBalanceDelta} from "../src/types/BalanceDelta.sol";
9+
import {Currency} from "../src/types/Currency.sol";
10+
import {PoolKey} from "../src/types/PoolKey.sol";
1111
import {IHooks} from "../src/interfaces/IHooks.sol";
1212
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
13-
import {TickMath} from "../src/libraries/TickMath.sol";
1413
import {SafeCast} from "../src/libraries/SafeCast.sol";
1514
import {SqrtPriceMath} from "../src/libraries/SqrtPriceMath.sol";
15+
import {TickMath} from "../src/libraries/TickMath.sol";
1616
import {Fuzzers} from "../src/test/Fuzzers.sol";
1717
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
1818

‎test/PoolManager.t.sol‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +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";
75
import {AmountHelpers} from "./utils/AmountHelpers.sol";
6+
import {Constants} from "./utils/Constants.sol";
7+
import {Deployers} from "./utils/Deployers.sol";
8+
import {BalanceDelta, BalanceDeltaLibrary} from "../src/types/BalanceDelta.sol";
9+
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
810
import {PoolId} from "../src/types/PoolId.sol";
911
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";
1212
import {IHooks} from "../src/interfaces/IHooks.sol";
1313
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1414
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
15-
import {Pool} from "../src/libraries/Pool.sol";
15+
import {CustomRevert} from "../src/libraries/CustomRevert.sol";
1616
import {Hooks} from "../src/libraries/Hooks.sol";
17-
import {TickMath} from "../src/libraries/TickMath.sol";
17+
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
18+
import {Pool} from "../src/libraries/Pool.sol";
1819
import {Position} from "../src/libraries/Position.sol";
20+
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
1921
import {SafeCast} from "../src/libraries/SafeCast.sol";
20-
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
2122
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
22-
import {CustomRevert} from "../src/libraries/CustomRevert.sol";
23-
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
23+
import {TickMath} from "../src/libraries/TickMath.sol";
2424
import {TransientStateLibrary} from "../src/libraries/TransientStateLibrary.sol";
2525
import {PoolManager} from "../src/PoolManager.sol";
2626
import {Action} from "../src/test/PoolNestedActionsTest.sol";
2727
import {Actions} from "../src/test/ActionsRouter.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";
3128
import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol";
32-
import {TestInvalidERC20} from "../src/test/TestInvalidERC20.sol";
29+
import {MockContract} from "../src/test/MockContract.sol";
30+
import {MockHooks} from "../src/test/MockHooks.sol";
3331
import {PoolEmptyUnlockTest} from "../src/test/PoolEmptyUnlockTest.sol";
3432
import {PoolModifyLiquidityTest} from "../src/test/PoolModifyLiquidityTest.sol";
33+
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
34+
import {TestInvalidERC20} from "../src/test/TestInvalidERC20.sol";
3535

3636
contract PoolManagerTest is Test, Deployers {
3737
using Hooks for IHooks;

‎test/PoolManagerInitialize.t.sol‎

Lines changed: 7 additions & 7 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";
65
import {Constants} from "./utils/Constants.sol";
6+
import {Deployers} from "./utils/Deployers.sol";
7+
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
78
import {PoolId} from "../src/types/PoolId.sol";
89
import {PoolKey} from "../src/types/PoolKey.sol";
9-
import {Currency, CurrencyLibrary} from "../src/types/Currency.sol";
1010
import {IHooks} from "../src/interfaces/IHooks.sol";
1111
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1212
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
13-
import {Pool} from "../src/libraries/Pool.sol";
1413
import {Hooks} from "../src/libraries/Hooks.sol";
15-
import {TickMath} from "../src/libraries/TickMath.sol";
1614
import {LPFeeLibrary} from "../src/libraries/LPFeeLibrary.sol";
17-
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
15+
import {Pool} from "../src/libraries/Pool.sol";
1816
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
17+
import {StateLibrary} from "../src/libraries/StateLibrary.sol";
18+
import {TickMath} from "../src/libraries/TickMath.sol";
1919
import {PoolManager} from "../src/PoolManager.sol";
20-
import {MockHooks} from "../src/test/MockHooks.sol";
21-
import {MockContract} from "../src/test/MockContract.sol";
2220
import {EmptyTestHooks} from "../src/test/EmptyTestHooks.sol";
21+
import {MockContract} from "../src/test/MockContract.sol";
22+
import {MockHooks} from "../src/test/MockHooks.sol";
2323

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

‎test/ProtocolFeesImplementation.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {Test} from "forge-std/Test.sol";
55
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
66
import {Constants} from "../test/utils/Constants.sol";
77
import {Deployers} from "../test/utils/Deployers.sol";
8+
import {Currency} from "../src/types/Currency.sol";
89
import {PoolId} from "../src/types/PoolId.sol";
910
import {PoolKey} from "../src/types/PoolKey.sol";
10-
import {Currency} from "../src/types/Currency.sol";
1111
import {IHooks} from "../src/interfaces/IHooks.sol";
1212
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
1313
import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";

‎test/SkipCallsTestHook.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ pragma solidity ^0.8.20;
44
import {Test} from "forge-std/Test.sol";
55
import {Vm} from "forge-std/Vm.sol";
66
import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
7+
import {Constants} from "../test/utils/Constants.sol";
78
import {Deployers} from "./utils/Deployers.sol";
9+
import {Currency} from "../src/types/Currency.sol";
810
import {PoolId} from "../src/types/PoolId.sol";
911
import {PoolKey} from "../src/types/PoolKey.sol";
10-
import {Currency} from "../src/types/Currency.sol";
1112
import {IHooks} from "../src/interfaces/IHooks.sol";
1213
import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
1314
import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
1415
import {Hooks} from "../src/libraries/Hooks.sol";
1516
import {PoolManager} from "../src/PoolManager.sol";
16-
import {Constants} from "../test/utils/Constants.sol";
1717
import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
1818
import {SkipCallsTestHook} from "../src/test/SkipCallsTestHook.sol";
1919

0 commit comments

Comments
 (0)