move setup to test base

Author: saucepoint

test/EulerSwapHook.swaps.t.sol

@@ -8,8 +8,6 @@ import {EulerSwapHook} from "../src/EulerSwapHook.sol";
 import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
 import {IPoolManager, PoolManagerDeployer} from "./utils/PoolManagerDeployer.sol";
 import {PoolSwapTest} from "@uniswap/v4-core/src/test/PoolSwapTest.sol";
-import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";
-import {HookMiner} from "v4-periphery/src/utils/HookMiner.sol";
 import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
 import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol";
 import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol";
@@ -27,29 +25,15 @@ contract EulerSwapHookTest is EulerSwapTestBase {
     function setUp() public virtual override {
         super.setUp();
 
-        // TODO: move upstream to EulerSwapTestBase?
         poolManager = PoolManagerDeployer.deploy(address(this));
         swapRouter = new PoolSwapTest(poolManager);
 
-        // eulerSwap = createEulerSwap(60e18, 60e18, 0, 1e18, 1e18, 0.4e18, 0.85e18);
-        IEulerSwap.Params memory poolParams = getEulerSwapParams(60e18, 60e18, 0);
-        IEulerSwap.CurveParams memory curveParams =
-            IEulerSwap.CurveParams({priceX: 1e18, priceY: 1e18, concentrationX: 0.4e18, concentrationY: 0.85e18});
-        bytes memory constructorArgs = abi.encode(poolManager, poolParams, curveParams);
-        uint160 flags = uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURNS_DELTA_FLAG);
-        (address hookAddress, bytes32 salt) =
-            HookMiner.find(creator, flags, type(EulerSwapHook).creationCode, constructorArgs);
-        vm.prank(creator);
-        eulerSwap = new EulerSwapHook{salt: salt}(poolManager, poolParams, curveParams);
-        assertEq(address(eulerSwap), hookAddress);
+        eulerSwap = createEulerSwapHook(poolManager, 60e18, 60e18, 0, 1e18, 1e18, 0.4e18, 0.85e18);
 
         // confirm pool was created
         assertFalse(eulerSwap.poolKey().currency1 == CurrencyLibrary.ADDRESS_ZERO);
         (uint160 sqrtPriceX96,,,) = poolManager.getSlot0(eulerSwap.poolKey().toId());
         assertNotEq(sqrtPriceX96, 0);
-
-        vm.prank(holder);
-        evc.setAccountOperator(holder, address(eulerSwap), true);
     }
 
     function test_SwapExactIn() public {

test/EulerSwapTestBase.t.sol

@@ -6,6 +6,10 @@ import {EVaultTestBase, TestERC20} from "evk-test/unit/evault/EVaultTestBase.t.s
 import {IEVault} from "evk/EVault/IEVault.sol";
 import {IEulerSwap, IEVC, EulerSwap} from "../src/EulerSwap.sol";
 import {EulerSwapPeriphery} from "../src/EulerSwapPeriphery.sol";
+import {EulerSwapHook} from "../src/EulerSwapHook.sol";
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+import {HookMiner} from "v4-periphery/src/utils/HookMiner.sol";
+import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";
 
 contract EulerSwapTestBase is EVaultTestBase {
     address public depositor = makeAddr("depositor");
@@ -96,6 +100,38 @@ contract EulerSwapTestBase is EVaultTestBase {
         return eulerSwap;
     }
 
+    function createEulerSwapHook(
+        IPoolManager _poolManager,
+        uint112 debtLimitA,
+        uint112 debtLimitB,
+        uint256 fee,
+        uint256 px,
+        uint256 py,
+        uint256 cx,
+        uint256 cy
+    ) internal returns (EulerSwapHook) {
+        IEulerSwap.Params memory poolParams = getEulerSwapParams(debtLimitA, debtLimitB, fee);
+        IEulerSwap.CurveParams memory curveParams =
+            IEulerSwap.CurveParams({priceX: px, priceY: py, concentrationX: cx, concentrationY: cy});
+
+        bytes memory constructorArgs = abi.encode(_poolManager, poolParams, curveParams);
+        (address hookAddress, bytes32 salt) = HookMiner.find(
+            creator,
+            uint160(Hooks.BEFORE_SWAP_FLAG | Hooks.BEFORE_SWAP_RETURNS_DELTA_FLAG),
+            type(EulerSwapHook).creationCode,
+            constructorArgs
+        );
+
+        vm.prank(creator);
+        EulerSwapHook eulerSwapHook = new EulerSwapHook{salt: salt}(_poolManager, poolParams, curveParams);
+        assertEq(address(eulerSwapHook), hookAddress);
+
+        vm.prank(holder);
+        evc.setAccountOperator(holder, address(eulerSwapHook), true);
+
+        return eulerSwapHook;
+    }
+
     function mintAndDeposit(address who, IEVault vault, uint256 amount) internal {
         TestERC20 tok = TestERC20(vault.asset());
         tok.mint(who, amount);