finish test harness for protocol fee params

Author: hoytech

test/Ctx.t.sol

@@ -14,7 +14,7 @@ contract CtxTest is EulerSwapTestBase {
     }
 
     function test_staticParamSize() public view {
-        IEulerSwap.Params memory params = getEulerSwapParams(1e18, 1e18, 1e18, 1e18, 0.4e18, 0.85e18, 0);
+        IEulerSwap.Params memory params = getEulerSwapParams(1e18, 1e18, 1e18, 1e18, 0.4e18, 0.85e18, 0, 0, address(0));
         assertEq(abi.encode(params).length, 384);
     }
 }

test/EulerSwapTestBase.t.sol

@@ -129,10 +129,24 @@ contract EulerSwapTestBase is EVaultTestBase {
         uint256 py,
         uint256 cx,
         uint256 cy
+    ) internal returns (EulerSwap) {
+        return createEulerSwapFull(reserve0, reserve1, fee, px, py, cx, cy, 0, address(0));
+    }
+
+    function createEulerSwapFull(
+        uint112 reserve0,
+        uint112 reserve1,
+        uint256 fee,
+        uint256 px,
+        uint256 py,
+        uint256 cx,
+        uint256 cy,
+        uint256 protocolFee,
+        address protcoolFeeRecipient
     ) internal returns (EulerSwap) {
         removeInstalledOperator();
 
-        IEulerSwap.Params memory params = getEulerSwapParams(reserve0, reserve1, px, py, cx, cy, fee);
+        IEulerSwap.Params memory params = getEulerSwapParams(reserve0, reserve1, px, py, cx, cy, fee, protocolFee, protcoolFeeRecipient);
         IEulerSwap.InitialState memory initialState =
             IEulerSwap.InitialState({currReserve0: reserve0, currReserve1: reserve1});
 
@@ -158,10 +172,24 @@ contract EulerSwapTestBase is EVaultTestBase {
         uint256 py,
         uint256 cx,
         uint256 cy
+    ) internal returns (EulerSwap) {
+        return createEulerSwapHookFull(reserve0, reserve1, fee, px, py, cx, cy, 0, address(0));
+    }
+
+    function createEulerSwapHookFull(
+        uint112 reserve0,
+        uint112 reserve1,
+        uint256 fee,
+        uint256 px,
+        uint256 py,
+        uint256 cx,
+        uint256 cy,
+        uint256 protocolFee,
+        address protocolFeeRecipient
     ) internal returns (EulerSwap) {
         removeInstalledOperator();
 
-        IEulerSwap.Params memory params = getEulerSwapParams(reserve0, reserve1, px, py, cx, cy, fee);
+        IEulerSwap.Params memory params = getEulerSwapParams(reserve0, reserve1, px, py, cx, cy, fee, protocolFee, protocolFeeRecipient);
         IEulerSwap.InitialState memory initialState =
             IEulerSwap.InitialState({currReserve0: reserve0, currReserve1: reserve1});
 
@@ -235,7 +263,9 @@ contract EulerSwapTestBase is EVaultTestBase {
         uint256 py,
         uint256 cx,
         uint256 cy,
-        uint256 fee
+        uint256 fee,
+        uint256 protocolFee,
+        address protocolFeeRecipient
     ) internal view returns (EulerSwap.Params memory) {
         return IEulerSwap.Params({
             vault0: address(eTST),
@@ -248,8 +278,8 @@ contract EulerSwapTestBase is EVaultTestBase {
             concentrationX: cx,
             concentrationY: cy,
             fee: fee,
-            protocolFee: 0,
-            protocolFeeRecipient: address(0)
+            protocolFee: protocolFee,
+            protocolFeeRecipient: protocolFeeRecipient
         });
     }
 

test/FactoryTest.t.sol

@@ -28,7 +28,7 @@ contract FactoryTest is EulerSwapTestBase {
         view
         returns (IEulerSwap.Params memory poolParams, IEulerSwap.InitialState memory initialState)
     {
-        poolParams = getEulerSwapParams(1e18, 1e18, 1e18, 1e18, 0.4e18, 0.85e18, 0);
+        poolParams = getEulerSwapParams(1e18, 1e18, 1e18, 1e18, 0.4e18, 0.85e18, 0, 0, address(0));
         initialState = IEulerSwap.InitialState({currReserve0: 1e18, currReserve1: 1e18});
     }
 

test/HookFees.t.sol

@@ -124,16 +124,14 @@ contract HookFeesTest is EulerSwapTestBase {
     }
 
     function test_protocolFee() public {
-        IEulerSwap.Params memory params = eulerSwap.getParams();
-        vm.prank(params.eulerAccount);
-        eulerSwapFactory.uninstallPool();
-
         // set protocol fee to 10% of the LP fee
-        eulerSwapFactory.setProtocolFee(0.1e18);
+        uint256 protocolFee = 0.1e18;
+
+        eulerSwapFactory.setProtocolFee(protocolFee);
         eulerSwapFactory.setProtocolFeeRecipient(protocolFeeRecipient);
 
         // set swap fee to 10 bips and activate the pool
-        eulerSwap = createEulerSwapHook(60e18, 60e18, 0.001e18, 1e18, 1e18, 0.4e18, 0.85e18);
+        eulerSwap = createEulerSwapHookFull(60e18, 60e18, 0.001e18, 1e18, 1e18, 0.4e18, 0.85e18, protocolFee, protocolFeeRecipient);
 
         int256 origNav = getHolderNAV();
         (uint112 r0, uint112 r1,) = eulerSwap.getReserves();