Fix rebase issues

Popcorn-Limited · Sep 20, 2024 · e7a70da · e7a70da
1 parent 904222b
commit e7a70da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/src/strategies/BaseAaveLeverageStrategy.sol b/src/strategies/BaseAaveLeverageStrategy.sol
@@ -182,6 +182,13 @@ abstract contract BaseAaveLeverageStrategy is BaseStrategy, IFlashLoanReceiver {
         (ltv, , ) = _getCurrentLTV();
     }
 
+    function convertToUnderlyingShares(
+        uint256 assets,
+        uint256 shares
+    ) public view override returns (uint256) {
+        revert();
+    }
+
     /*//////////////////////////////////////////////////////////////
                           MANAGEMENT LOGIC
     //////////////////////////////////////////////////////////////*/

diff --git a/src/strategies/lido/WstETHLooper.sol b/src/strategies/lido/WstETHLooper.sol
@@ -141,23 +141,4 @@ contract WstETHLooper is BaseAaveLeverageStrategy {
             IERC20(asset()).transfer(recipient, wstETHBalance);
         }
     }
-
-    /*//////////////////////////////////////////////////////////////
-                          NOT IMPLEMENTED
-    //////////////////////////////////////////////////////////////*/
-
-    function convertToUnderlyingShares(
-        uint256 assets,
-        uint256 shares
-    ) public view override returns (uint256) {
-        revert();
-    }
-
-    function claim() internal override returns (bool success) {
-        revert();
-    }
-
-    function rewardTokens() external view override returns (address[] memory) {
-        revert();
-    }
 }
diff --git a/src/vaults/MultiStrategyVault.sol b/src/vaults/MultiStrategyVault.sol
@@ -405,7 +405,7 @@ contract MultiStrategyVault is
                         address(strategy),
                         withdrawableAssets
                     );
-                }   
+                }
             }
         }
     }
@@ -660,8 +660,11 @@ contract MultiStrategyVault is
      * @param allocations An array of structs each including the strategyIndex to withdraw from and the amount of assets
      */
     function pullFunds(Allocation[] calldata allocations) external onlyOwner {
+        _pullFunds(allocations);
+    }
+
+    function _pullFunds(Allocation[] calldata allocations) internal {
         uint256 len = allocations.length;
-
         for (uint256 i; i < len; i++) {
             if (allocations[i].amount > 0) {
                 strategies[allocations[i].index].withdraw(
@@ -893,4 +896,4 @@ contract MultiStrategyVault is
                 )
             );
     }
-}
+}