From b75c042aed7b2ba34a693101727d10bb153e06b6 Mon Sep 17 00:00:00 2001 From: katzman Date: Wed, 13 Sep 2023 23:06:28 +0000 Subject: [PATCH] Fix accounts strategy test --- test/core/accounts/AccountsStrategy.ts | 54 +++++++++++++------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/test/core/accounts/AccountsStrategy.ts b/test/core/accounts/AccountsStrategy.ts index b9890d83e..3b080a6f0 100644 --- a/test/core/accounts/AccountsStrategy.ts +++ b/test/core/accounts/AccountsStrategy.ts @@ -271,7 +271,7 @@ describe("AccountsStrategy", function () { destinationChain: "", strategyId: DEFAULT_STRATEGY_ID, selector: DEFAULT_METHOD_SELECTOR, - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: investRequest.lockAmt, liqAmt: investRequest.liquidAmt, @@ -300,7 +300,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THIS, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: investRequest.lockAmt, liqAmt: investRequest.liquidAmt, @@ -343,7 +343,7 @@ describe("AccountsStrategy", function () { destinationChain: "", strategyId: DEFAULT_STRATEGY_ID, selector: DEFAULT_METHOD_SELECTOR, - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: investRequest.lockAmt, liqAmt: investRequest.liquidAmt, @@ -401,7 +401,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -511,7 +511,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: caseData.lockAmt, liqAmt: caseData.liqAmt, @@ -676,7 +676,7 @@ describe("AccountsStrategy", function () { destinationChain: "", strategyId: DEFAULT_STRATEGY_ID, selector: DEFAULT_METHOD_SELECTOR, - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -700,7 +700,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THIS, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("redeem"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -735,7 +735,7 @@ describe("AccountsStrategy", function () { destinationChain: "", strategyId: DEFAULT_STRATEGY_ID, selector: DEFAULT_METHOD_SELECTOR, - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -777,7 +777,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("redeem"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -881,7 +881,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("redeem"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: caseData.lockAmt, liqAmt: caseData.liqAmt, @@ -1020,7 +1020,7 @@ describe("AccountsStrategy", function () { destinationChain: "", strategyId: DEFAULT_STRATEGY_ID, selector: DEFAULT_METHOD_SELECTOR, - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -1044,7 +1044,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THIS, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("redeemAll"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1083,7 +1083,7 @@ describe("AccountsStrategy", function () { destinationChain: "", strategyId: DEFAULT_STRATEGY_ID, selector: DEFAULT_METHOD_SELECTOR, - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -1136,7 +1136,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("redeemAll"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1336,7 +1336,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("redeemAll"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: redeemAllRequest.redeemLocked ? 1 : 0, liqAmt: redeemAllRequest.redeemLiquid ? 1 : 0, @@ -1421,7 +1421,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1445,7 +1445,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1472,7 +1472,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1494,7 +1494,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1528,7 +1528,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1559,7 +1559,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1584,7 +1584,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1613,7 +1613,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1640,7 +1640,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: 1, liqAmt: 1, @@ -1669,7 +1669,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash("deposit"), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -1708,7 +1708,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash(vaultFunction), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT, @@ -1796,7 +1796,7 @@ describe("AccountsStrategy", function () { destinationChain: NET_NAME_THAT, strategyId: DEFAULT_STRATEGY_ID, selector: vault.interface.getSighash(vaultFunction), - accountIds: [ACCOUNT_ID], + accountId: ACCOUNT_ID, token: token.address, lockAmt: LOCK_AMT, liqAmt: LIQ_AMT,