Add ERC4626Adapter tests

Author: lastperson

contracts/ERC4626Adapter.sol

@@ -40,6 +40,7 @@ contract ERC4626Adapter is ILiquidityPoolBase, AccessControl {
     constructor(address assets, address targetVault, address admin) {
         require(assets != address(0), ZeroAddress());
         require(targetVault != address(0), ZeroAddress());
+        require(admin != address(0), ZeroAddress());
         require(assets == IERC4626(targetVault).asset(), IncompatibleAssets());
         TARGET_VAULT = IERC4626(targetVault);
         ASSETS = IERC20(assets);
@@ -56,11 +57,11 @@ contract ERC4626Adapter is ILiquidityPoolBase, AccessControl {
         _;
     }
 
-    function deposit(uint256 amount) external override onlyRole(LIQUIDITY_ADMIN_ROLE) {
+    function deposit(uint256 amount) external override onlyRole(LIQUIDITY_ADMIN_ROLE) whenNotPaused() {
         _deposit(_msgSender(), amount);
     }
 
-    function depositWithPull(uint256 amount) external override {
+    function depositWithPull(uint256 amount) external override whenNotPaused() {
         ASSETS.safeTransferFrom(_msgSender(), address(this), amount);
         _deposit(_msgSender(), amount);
     }
@@ -114,14 +115,15 @@ contract ERC4626Adapter is ILiquidityPoolBase, AccessControl {
 
     function _withdrawProfitLogic(IERC20 token) internal returns (uint256) {
         require(token != IERC20(TARGET_VAULT), InvalidToken());
+        uint256 localBalance = token.balanceOf(address(this));
         if (token == ASSETS) {
             uint256 deposited = totalDeposited;
-            uint256 totalBalance = TARGET_VAULT.maxWithdraw(address(this));
-            if (totalBalance < deposited) return 0;
-            uint256 profit = totalBalance - deposited;
+            uint256 vaultBalance = TARGET_VAULT.maxWithdraw(address(this));
+            if (vaultBalance < deposited) return localBalance;
+            uint256 profit = vaultBalance - deposited;
             TARGET_VAULT.withdraw(profit, address(this), address(this));
-            return profit;
+            return profit + localBalance;
         }
-        return token.balanceOf(address(this));
+        return localBalance;
     }
 }

contracts/Rebalancer.sol

@@ -6,7 +6,7 @@ import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import {ERC7201Helper} from "./utils/ERC7201Helper.sol";
-import {ILiquidityPool} from "./interfaces/ILiquidityPool.sol";
+import {ILiquidityPoolBase} from "./interfaces/ILiquidityPoolBase.sol";
 import {IRebalancer} from "./interfaces/IRebalancer.sol";
 import {CCTPAdapter} from "./utils/CCTPAdapter.sol";
 
@@ -105,7 +105,7 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable, CCTPAdapter {
             require(pool != address(0), ZeroAddress());
             if (domain == DOMAIN) {
                 require(provider == Provider.LOCAL, UnsupportedProvider());
-                require(ILiquidityPool(pool).ASSETS() == ASSETS, InvalidPoolAssets());
+                require(ILiquidityPoolBase(pool).ASSETS() == ASSETS, InvalidPoolAssets());
             } else {
                 require(provider != Provider.LOCAL, UnsupportedProvider());
             }
@@ -170,7 +170,7 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable, CCTPAdapter {
         require(isRouteAllowed(destinationPool, destinationDomain, provider), RouteDenied());
 
         emit InitiateRebalance(amount, sourcePool, destinationPool, destinationDomain, provider);
-        ILiquidityPool(sourcePool).withdraw(address(this), amount);
+        ILiquidityPoolBase(sourcePool).withdraw(address(this), amount);
 
         if (provider == Provider.LOCAL) {
             // This should always pass because isRouteAllowed check will fail earlier.
@@ -197,7 +197,7 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable, CCTPAdapter {
         uint256 depositAmount = 0;
         if (provider == Provider.CCTP) {
             depositAmount = processTransferCCTP(ASSETS, destinationPool, extraData);
-            ILiquidityPool(destinationPool).deposit(depositAmount);
+            ILiquidityPoolBase(destinationPool).deposit(depositAmount);
         } else {
             // Unreachable atm, but could become so when more providers are added to enum.
             revert UnsupportedProvider();
@@ -211,7 +211,7 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable, CCTPAdapter {
         address destinationPool
     ) internal {
         ASSETS.safeTransfer(destinationPool, amount);
-        ILiquidityPool(destinationPool).deposit(amount);
+        ILiquidityPoolBase(destinationPool).deposit(amount);
 
         emit ProcessRebalance(amount, destinationPool, Provider.LOCAL);
     }