[No ticket] Silence warning by removing extraneous variable (and test) (

#180)
circlefin · Feb 14, 2023 · 2137b01 · 2137b01
1 parent 18f71fb
commit 2137b01
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 32 deletions.
diff --git a/contracts/controllers/WithdrawController.sol b/contracts/controllers/WithdrawController.sol
@@ -309,8 +309,7 @@ contract WithdrawController is IWithdrawController, BeaconImplementation {
         returns (uint256 maxShares)
     {
         maxShares = PoolLib.calculateMaxCancellation(
-            _currentWithdrawState(owner),
-            _pool.settings().requestCancellationFeeBps
+            _currentWithdrawState(owner)
         );
     }
 

diff --git a/contracts/libraries/PoolLib.sol b/contracts/libraries/PoolLib.sol
@@ -542,10 +542,11 @@ library PoolLib {
      * @dev Calculates the Maximum amount of shares that can be cancelled
      * from the current withdraw request.
      */
-    function calculateMaxCancellation(
-        IPoolWithdrawState memory state,
-        uint256 requestCancellationFeeBps
-    ) public pure returns (uint256) {
+    function calculateMaxCancellation(IPoolWithdrawState memory state)
+        public
+        pure
+        returns (uint256)
+    {
         return state.requestedShares + state.eligibleShares;
     }
 

diff --git a/contracts/mocks/PoolLibTestWrapper.sol b/contracts/mocks/PoolLibTestWrapper.sol
@@ -272,11 +272,11 @@ contract PoolLibTestWrapper is ERC20("PoolLibTest", "PLT") {
             );
     }
 
-    function calculateMaxCancellation(
-        IPoolWithdrawState memory state,
-        uint256 requestCancellationFeeBps
-    ) public pure returns (uint256) {
-        return
-            PoolLib.calculateMaxCancellation(state, requestCancellationFeeBps);
+    function calculateMaxCancellation(IPoolWithdrawState memory state)
+        public
+        pure
+        returns (uint256)
+    {
+        return PoolLib.calculateMaxCancellation(state);
     }
 }
diff --git a/test/libraries/PoolLib.test.ts b/test/libraries/PoolLib.test.ts
@@ -861,23 +861,6 @@ describe("PoolLib", () => {
     it("returns the number of shares the owner can cancel from a request", async () => {
       const { poolLibWrapper } = await loadFixture(deployFixture);
 
-      const fees = 0;
-      const withdrawState = buildWithdrawState({
-        requestedShares: 50,
-        eligibleShares: 22,
-        redeemableShares: 28,
-        latestRequestPeriod: 2
-      });
-
-      expect(
-        await poolLibWrapper.calculateMaxCancellation(withdrawState, fees)
-      ).to.equal(72);
-    });
-
-    it("returns the number of shares irrespective of fees ", async () => {
-      const { poolLibWrapper } = await loadFixture(deployFixture);
-
-      const fees = 1200; // 12%
       const withdrawState = buildWithdrawState({
         requestedShares: 50,
         eligibleShares: 22,
@@ -886,7 +869,7 @@ describe("PoolLib", () => {
       });
 
       expect(
-        await poolLibWrapper.calculateMaxCancellation(withdrawState, fees)
+        await poolLibWrapper.calculateMaxCancellation(withdrawState)
       ).to.equal(72);
     });
   });

diff --git a/test/scenarios/pool/withdraw-request.test.ts b/test/scenarios/pool/withdraw-request.test.ts
@@ -194,8 +194,9 @@ describe("Withdraw Requests", () => {
   });
 
   it("allows canceling a full request balance", async () => {
-    const { pool, aliceLender, bobLender, withdrawController } =
-      await loadFixture(loadPoolFixture);
+    const { pool, aliceLender, withdrawController } = await loadFixture(
+      loadPoolFixture
+    );
 
     // Alice requests full redemption
     await pool