From a7da714e54f2c6e2427ac44c26e5c359ebde92aa Mon Sep 17 00:00:00 2001 From: Dean Tribble Date: Tue, 4 May 2021 16:14:22 -0700 Subject: [PATCH] fix: remove awaita from `depositMultiple` --- packages/vats/src/distributeFees.js | 2 +- packages/vats/src/types.js | 2 +- packages/vats/src/vat-bank.js | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/vats/src/distributeFees.js b/packages/vats/src/distributeFees.js index b56534ae69e..93ce951c4ed 100644 --- a/packages/vats/src/distributeFees.js +++ b/packages/vats/src/distributeFees.js @@ -67,7 +67,7 @@ export function buildDistributor(treasury, bank, epochTimer, timer, params) { const accounts = queuedAccounts.splice(0, depositsPerUpdate); const payments = queuedPayments.splice(0, depositsPerUpdate); E(bank) - .depositMultiple(accounts, payments) + .depositMultiple(runBrand, accounts, payments) .then(settledResults => { const rejectedPayments = payments.filter( (_pmt, i) => diff --git a/packages/vats/src/types.js b/packages/vats/src/types.js index 34b4ed7faac..f0f3d0c54c3 100644 --- a/packages/vats/src/types.js +++ b/packages/vats/src/types.js @@ -53,7 +53,7 @@ /** * @typedef {Object} BankDepositFacet * - * @property {(accounts: string[], payments: Payment[]) => Promise[]>} depositMultiple + * @property {(brand: Brand, accounts: string[], payments: Payment[]) => Promise[]>} depositMultiple * @property {() => Notifier} getAccountsNotifier */ diff --git a/packages/vats/src/vat-bank.js b/packages/vats/src/vat-bank.js index b38b6d24f8e..2e703c00e59 100644 --- a/packages/vats/src/vat-bank.js +++ b/packages/vats/src/vat-bank.js @@ -206,7 +206,7 @@ export function buildRootObject(_vatPowers) { const assetRecord = brandToAssetRecord.get(brand); if (!bankCall) { // Just emulate with a real purse. - const purse = await E(assetRecord.issuer).makeEmptyPurse(); + const purse = E(assetRecord.issuer).makeEmptyPurse(); brandToVPurse.init(brand, purse); return purse; } @@ -266,22 +266,23 @@ export function buildRootObject(_vatPowers) { return accountsNotifier; }, /** - * Send many independent deposits. If any of them fail, then you should - * reclaim the corresponding payments since they didn't get deposited. + * Send many independent deposits, all of the same brand. If any of them + * fail, then you should reclaim the corresponding payments since they + * didn't get deposited. * + * @param {Brand} brand * @param {Array} accounts * @param {Array} payments * @returns {Promise[]>} */ - depositMultiple(accounts, payments) { + depositMultiple(brand, accounts, payments) { /** * @param {string} account * @param {Payment} payment */ - const doDeposit = async (account, payment) => { + const doDeposit = (account, payment) => { // We can get the alleged brand, because the purse we send it to // will do the proper verification as part of deposit. - const brand = await E(payment).getAllegedBrand(); const bank = getBankForAddress(account); const purse = bank.getPurse(brand); return E(purse).deposit(payment);