Merge remote-tracking branch 'origin/nicka/oeth-arm' into nicka/allocate

Author: naddison36

contracts/contracts/vault/OETHVaultCore.sol

@@ -17,7 +17,7 @@ contract OETHVaultCore is VaultCore {
     using SafeERC20 for IERC20;
     using StableMath for uint256;
 
-    uint256 constant CLAIM_DELAY = 30 minutes;
+    uint256 constant CLAIM_DELAY = 10 minutes;
     address public immutable weth;
     uint256 public wethAssetIndex;
 

contracts/test/vault/oeth-vault.js

@@ -501,7 +501,7 @@ describe("OETH Vault", function () {
   });
 
   describe("Withdrawal Queue", () => {
-    const delayPeriod = 30 * 60; // 30 minutes
+    const delayPeriod = 10 * 60; // 10 minutes
     describe("with all 60 WETH in the vault", () => {
       beforeEach(async () => {
         const { oethVault, weth, daniel, josh, matt } = fixture;

contracts/test/vault/oeth-vault.mainnet.fork-test.js

@@ -66,7 +66,7 @@ describe("ForkTest: OETH Vault", function () {
 
   describe("user operations", () => {
     let oethWhaleSigner;
-    const delayPeriod = 30 * 60; // 30 minutes
+    const delayPeriod = 10 * 60; // 10 minutes
     beforeEach(async () => {
       oethWhaleSigner = await impersonateAndFund(oethWhaleAddress);
     });