Merge pull request #134 from OffchainLabs/ha/mv-remove-switch-func

MasterVault: remove switchSubVault

Author: godzillaba

contracts/tokenbridge/libraries/vault/MasterVault.sol

@@ -99,16 +99,6 @@ contract MasterVault is Initializable, ERC4626Upgradeable, AccessControlUpgradea
     /// @param  _subVault The subvault to set. Must be an ERC4626 vault with the same asset as this MasterVault.
     /// @param  minSubVaultExchRateWad Minimum acceptable ratio (times 1e18) of new subvault shares to outstanding MasterVault shares after deposit.
     function setSubVault(IERC4626 _subVault, uint256 minSubVaultExchRateWad) external onlyRole(VAULT_MANAGER_ROLE) {
-        _setSubVault(_subVault, minSubVaultExchRateWad);
-    }
-
-    /// @notice Revokes the current subvault, moving all assets back to MasterVault
-    /// @param minAssetExchRateWad Minimum acceptable ratio (times 1e18) of assets received from subvault to outstanding MasterVault shares
-    function revokeSubVault(uint256 minAssetExchRateWad) external onlyRole(VAULT_MANAGER_ROLE) {
-        _revokeSubVault(minAssetExchRateWad);
-    }
-
-    function _setSubVault(IERC4626 _subVault, uint256 minSubVaultExchRateWad) internal {
         IERC20 underlyingAsset = IERC20(asset());
         if (address(subVault) != address(0)) revert SubVaultAlreadySet();
         if (address(_subVault.asset()) != address(underlyingAsset)) revert SubVaultAssetMismatch();
@@ -124,7 +114,9 @@ contract MasterVault is Initializable, ERC4626Upgradeable, AccessControlUpgradea
         emit SubvaultChanged(address(0), address(_subVault));
     }
 
-    function _revokeSubVault(uint256 minAssetExchRateWad) internal {
+    /// @notice Revokes the current subvault, moving all assets back to MasterVault
+    /// @param minAssetExchRateWad Minimum acceptable ratio (times 1e18) of assets received from subvault to outstanding MasterVault shares
+    function revokeSubVault(uint256 minAssetExchRateWad) external onlyRole(VAULT_MANAGER_ROLE) {
         IERC4626 oldSubVault = subVault;
         if (address(oldSubVault) == address(0)) revert NoExistingSubVault();
 
@@ -139,18 +131,6 @@ contract MasterVault is Initializable, ERC4626Upgradeable, AccessControlUpgradea
         emit SubvaultChanged(address(oldSubVault), address(0));
     }
 
-    /// @notice Switches to a new subvault or revokes current subvault if newSubVault is zero address
-    /// @param newSubVault The new subvault to switch to, or zero address to revoke current subvault
-    /// @param minAssetExchRateWad Minimum acceptable ratio (times 1e18) of assets received from old subvault to outstanding MasterVault shares
-    /// @param minNewSubVaultExchRateWad Minimum acceptable ratio (times 1e18) of new subvault shares to outstanding MasterVault shares after deposit
-    function switchSubVault(IERC4626 newSubVault, uint256 minAssetExchRateWad, uint256 minNewSubVaultExchRateWad) external onlyRole(VAULT_MANAGER_ROLE) {
-        _revokeSubVault(minAssetExchRateWad);
-
-        if (address(newSubVault) != address(0)) {
-            _setSubVault(newSubVault, minNewSubVaultExchRateWad);
-        }
-    }
-
     function masterSharesToSubShares(uint256 masterShares, MathUpgradeable.Rounding rounding) public view returns (uint256) {
         // masterShares * totalSubVaultShares / totalMasterShares
         return masterShares.mulDiv(subVault.balanceOf(address(this)), totalSupply(), rounding);

test-foundry/libraries/vault/MasterVault.t.sol

@@ -126,48 +126,6 @@ contract MasterVaultTest is Test {
         assertEq(subVault.balanceOf(address(vault)), depositAmount, "SubVault should have received assets");
     }
 
-    function test_switchSubvault() public {
-        MockSubVault oldSubVault = new MockSubVault(
-            IERC20(address(token)),
-            "Old Sub Vault",
-            "osvTST"
-        );
-
-        MockSubVault newSubVault = new MockSubVault(
-            IERC20(address(token)),
-            "New Sub Vault",
-            "nsvTST"
-        );
-
-        vm.startPrank(user);
-        token.mint();
-        uint256 depositAmount = token.balanceOf(user);
-        token.approve(address(vault), depositAmount);
-        vault.deposit(depositAmount, user, 0);
-        vm.stopPrank();
-
-        vault.setSubVault(oldSubVault, 1e18);
-
-        assertEq(address(vault.subVault()), address(oldSubVault), "Old subvault should be set");
-        assertEq(oldSubVault.balanceOf(address(vault)), depositAmount, "Old subvault should have assets");
-        assertEq(newSubVault.balanceOf(address(vault)), 0, "New subvault should have no assets initially");
-
-        uint256 minAssetExchRateWad = 1e18;
-        uint256 minNewSubVaultExchRateWad = 1e18;
-
-        vm.expectEmit(true, true, false, false);
-        emit SubvaultChanged(address(oldSubVault), address(0));
-        vm.expectEmit(true, true, false, false);
-        emit SubvaultChanged(address(0), address(newSubVault));
-
-        vault.switchSubVault(newSubVault, minAssetExchRateWad, minNewSubVaultExchRateWad);
-
-        assertEq(address(vault.subVault()), address(newSubVault), "New subvault should be set");
-        assertEq(vault.totalAssets(), depositAmount, "Total assets should remain the same");
-        assertEq(oldSubVault.balanceOf(address(vault)), 0, "Old subvault should have no assets");
-        assertEq(newSubVault.balanceOf(address(vault)), depositAmount, "New subvault should have received assets");
-    }
-
     function test_revokeSubvault() public {
         MockSubVault subVault = new MockSubVault(
             IERC20(address(token)),