Fix tests after redeem has been removed

contracts/contracts/mocks/MockNonRebasing.sol

@@ -47,7 +47,7 @@ contract MockNonRebasing {
     }
 
     function redeemOusd(address _vaultContract, uint256 _amount) public {
-        IVault(_vaultContract).redeem(_amount, 0);
+        IVault(_vaultContract).requestWithdrawal(_amount);
     }
 
     function approveFor(

contracts/contracts/vault/VaultCore.sol

@@ -623,46 +623,6 @@ abstract contract VaultCore is VaultInitializer {
         return balance + queue.claimed - queue.queued;
     }
 
-    /**
-     * @notice Deprecated. Use calculateRedeemOutput instead.
-     */
-    function calculateRedeemOutputs(uint256 _amount)
-        external
-        view
-        returns (uint256[] memory outputs)
-    {
-        outputs = new uint256[](1);
-        outputs[0] = _calculateRedeemOutput(_amount);
-    }
-
-    /**
-     * @notice Calculate the amount of asset received on redeeming OToken.
-     * @param _amount Amount of OToken to redeem
-     * @return Amount of asset received
-     */
-    function calculateRedeemOutput(uint256 _amount)
-        external
-        view
-        returns (uint256)
-    {
-        return _calculateRedeemOutput(_amount);
-    }
-
-    /**
-     * @dev Calculate the amount of asset received on redeeming OToken.
-     * @param _amount Amount of OToken to redeem
-     * @return Amount of asset received
-     */
-    function _calculateRedeemOutput(uint256 _amount)
-        internal
-        view
-        virtual
-        returns (uint256)
-    {
-        // Redeem 1:1 with asynchronous withdrawals
-        return _amount.scaleBy(assetDecimals, 18);
-    }
-
     /**
      * @notice Adds WETH to the withdrawal queue if there is a funding shortfall.
      * @dev is called from the Native Staking strategy when validator withdrawals are processed.

contracts/deploy/deployActions.js

@@ -300,6 +300,11 @@ const configureVault = async () => {
   await withConfirmation(
     cVault.connect(sGovernor).setStrategistAddr(strategistAddr)
   );
+
+  // Set withdrawal claim delay to 10m
+  await withConfirmation(
+    cVault.connect(sGovernor).setWithdrawalClaimDelay(10 * 60)
+  );
 };
 
 /**
@@ -331,9 +336,6 @@ const configureOETHVault = async () => {
     cVault.connect(sGovernor).setStrategistAddr(strategistAddr)
   );
 
-  // Redeem fee to 0
-  await withConfirmation(cVault.connect(sGovernor).setRedeemFeeBps(0));
-
   // Allocate threshold
   await withConfirmation(
     cVault

contracts/node.sh

@@ -91,8 +91,6 @@ main()
         done
         printf "\n"
         echo "🟢 Node initialized"
-
-        FORK_NETWORK_NAME=$FORK_NETWORK_NAME FORK=true npx hardhat fund --amount 100000 --network localhost --accountsfromenv true &
 
         # wait for subprocesses to finish
         for job in `jobs -p`

contracts/package.json

@@ -31,8 +31,8 @@
     "lint:js": "eslint \"test/**/*.js\" \"tasks/**/*.js\" \"deploy/**/*.js\"",
     "lint:sol": "solhint \"contracts/**/*.sol\"",
     "prettier": "yarn run prettier:js && yarn run prettier:sol",
-    "prettier:check": "prettier -c \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"smoke/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
-    "prettier:js": "prettier --write \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"smoke/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
+    "prettier:check": "prettier -c \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
+    "prettier:js": "prettier --write \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
     "prettier:sol": "prettier --write --plugin=prettier-plugin-solidity \"contracts/**/*.sol\"",
     "test": "rm -rf deployments/hardhat && IS_TEST=true npx hardhat test",
     "test:base": "rm -rf deployments/hardhat && UNIT_TESTS_NETWORK=base IS_TEST=true npx hardhat test",