fix unused imports and updated names

Author: mmsaki

src/router.sol

@@ -5,12 +5,10 @@ import { IAsyncSwapAMM } from "@async-swap/interfaces/IAsyncSwapAMM.sol";
 import { IRouter } from "@async-swap/interfaces/IRouter.sol";
 import { AsyncOrder } from "@async-swap/types/AsyncOrder.sol";
 import { CurrencySettler } from "@uniswap/v4-core/test/utils/CurrencySettler.sol";
-import { console } from "forge-std/Test.sol";
 import { IPoolManager } from "v4-core/interfaces/IPoolManager.sol";
 import { IERC20Minimal } from "v4-core/interfaces/external/IERC20Minimal.sol";
 import { SafeCast } from "v4-core/libraries/SafeCast.sol";
 import { Currency, CurrencyLibrary } from "v4-core/types/Currency.sol";
-import { PoolKey } from "v4-core/types/PoolKey.sol";
 
 /// @title Router Contract
 /// @author Async Labs
@@ -23,9 +21,9 @@ contract Router is IRouter {
   using SafeCast for *;
 
   /// PoolManager contract to interact with the pools.
-  IPoolManager immutable poolManager;
+  IPoolManager immutable POOLMANAGER;
   /// Async Swap Hook contract to execute async orders.
-  IAsyncSwapAMM immutable hook;
+  IAsyncSwapAMM immutable HOOK;
 
   /// keccak256("Router.ActionType") - 1
   bytes32 constant ACTION_LOCATION = 0xf3b150ebf41dad0872df6788629edb438733cb4a5c9ea779b1b1f3614faffc69;
@@ -38,13 +36,13 @@ contract Router is IRouter {
   /// @param _poolManager The PoolManager contract that manages the pools.
   /// @param _hook The Async CSMM hook contract that executes async orders.
   constructor(IPoolManager _poolManager, IAsyncSwapAMM _hook) {
-    poolManager = _poolManager;
-    hook = _hook;
+    POOLMANAGER = _poolManager;
+    HOOK = _hook;
   }
 
   /// Only allow the PoolManager to call certain functions.
   modifier onlyPoolManager() {
-    require(msg.sender == address(poolManager));
+    require(msg.sender == address(POOLMANAGER));
     _;
   }
 
@@ -58,7 +56,7 @@ contract Router is IRouter {
       tstore(ASYNC_FILLER_LOCATION, onBehalf)
     }
 
-    poolManager.unlock(abi.encode(SwapCallback(ActionType.Swap, order)));
+    POOLMANAGER.unlock(abi.encode(SwapCallback(ActionType.Swap, order)));
   }
 
   /// @inheritdoc IRouter
@@ -70,7 +68,7 @@ contract Router is IRouter {
       tstore(ASYNC_FILLER_LOCATION, onBehalf)
     }
 
-    poolManager.unlock(abi.encode(SwapCallback(ActionType.FillOrder, order)));
+    POOLMANAGER.unlock(abi.encode(SwapCallback(ActionType.FillOrder, order)));
   }
 
   /// Callback handler to unlock the PoolManager after a swap or fill order.
@@ -93,15 +91,15 @@ contract Router is IRouter {
     if (action == 0) {
       SwapCallback memory orderData = abi.decode(data, (SwapCallback));
 
-      poolManager.swap(
+      POOLMANAGER.swap(
         orderData.order.key,
         IPoolManager.SwapParams(
           orderData.order.zeroForOne, -orderData.order.amountIn.toInt256(), orderData.order.sqrtPrice
         ),
         abi.encode(user, asyncFiller)
       );
       Currency specified = orderData.order.zeroForOne ? orderData.order.key.currency0 : orderData.order.key.currency1;
-      specified.settle(poolManager, user, orderData.order.amountIn, false); // transfer
+      specified.settle(POOLMANAGER, user, orderData.order.amountIn, false); // transfer
     }
 
     /// @notice Handle Async Order Fill
@@ -110,8 +108,8 @@ contract Router is IRouter {
       SwapCallback memory orderData = abi.decode(data, (SwapCallback));
       Currency currency = orderData.order.zeroForOne ? orderData.order.key.currency1 : orderData.order.key.currency0;
       assert(IERC20Minimal(Currency.unwrap(currency)).transferFrom(user, asyncFiller, orderData.order.amountIn));
-      assert(IERC20Minimal(Currency.unwrap(currency)).approve(address(hook), orderData.order.amountIn));
-      hook.executeOrder(orderData.order, abi.encode(asyncFiller));
+      assert(IERC20Minimal(Currency.unwrap(currency)).approve(address(HOOK), orderData.order.amountIn));
+      HOOK.executeOrder(orderData.order, abi.encode(asyncFiller));
     }
 
     return "";

test/Algorithm2Test.t.sol

@@ -2,17 +2,15 @@
 pragma solidity ^0.8.13;
 
 import { SetupHook } from "./SetupHook.sol";
-import { Algorithm2 } from "@async-swap/algorithms/algorithm-2.sol";
 import { IAlgorithm } from "@async-swap/interfaces/IAlgorithm.sol";
-import "forge-std/Test.sol";
 
 contract Algorithm2Test is SetupHook {
 
   IAlgorithm algorithm;
 
   function setUp() public override {
     super.setUp();
-    algorithm = hook.algorithm();
+    algorithm = hook.ALGORITHM();
   }
 
   /// this should test the intialized algoritm was selected

test/AsyncSwap.t.sol

@@ -2,21 +2,14 @@
 pragma solidity ^0.8.13;
 
 import { SetupHook } from "./SetupHook.sol";
-import { AsyncSwap } from "@async-swap/AsyncSwap.sol";
-import { IRouter } from "@async-swap/interfaces/IRouter.sol";
-import { AsyncFiller } from "@async-swap/libraries/AsyncFiller.sol";
 import { AsyncOrder } from "@async-swap/types/AsyncOrder.sol";
-import { console } from "forge-std/Test.sol";
-import { Currency, IHooks, IPoolManager } from "v4-core/interfaces/IPoolManager.sol";
-import { PoolSwapTest } from "v4-core/test/PoolSwapTest.sol";
+import { Currency } from "v4-core/interfaces/IPoolManager.sol";
 import { CurrencyLibrary } from "v4-core/types/Currency.sol";
-import { PoolKey } from "v4-core/types/PoolKey.sol";
 
 /// @title Async Swap test contract
 contract AsyncSwapTest is SetupHook {
 
   using CurrencyLibrary for Currency;
-  using AsyncFiller for AsyncOrder;
 
   address asyncFiller = makeAddr("asyncFiller");
   address user = makeAddr("user");

test/SetupHook.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.13;
 
 import { AsyncSwap } from "@async-swap/AsyncSwap.sol";
 import { Router } from "@async-swap/router.sol";
-import { Test, console } from "forge-std/Test.sol";
+import { Test } from "forge-std/Test.sol";
 import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
 import { PoolManager } from "v4-core/PoolManager.sol";
-import { Currency, IHooks, IPoolManager } from "v4-core/interfaces/IPoolManager.sol";
+import { Currency, IPoolManager } from "v4-core/interfaces/IPoolManager.sol";
 import { Hooks } from "v4-core/libraries/Hooks.sol";
 import { LPFeeLibrary } from "v4-core/libraries/LPFeeLibrary.sol";
 import { PoolId } from "v4-core/types/PoolId.sol";