Merge pull request #7131 from Agoric/ta/appendToStoredArray

misc refactorings
Agoric · Mar 9, 2023 · 2e33306 · 2e33306
2 parents 97f6488 + d792b5d
commit 2e33306
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/packages/inter-protocol/src/auction/auctioneer.js b/packages/inter-protocol/src/auction/auctioneer.js
@@ -21,7 +21,7 @@ import {
 import { handleParamGovernance } from '@agoric/governance';
 import { makeTracer, BASIS_POINTS } from '@agoric/internal';
 import { FullProposalShape } from '@agoric/zoe/src/typeGuards.js';
-
+import { appendToStoredArray } from '@agoric/store/src/stores/store-utils.js';
 import { makeAuctionBook } from './auctionBook.js';
 import { AuctionState } from './util.js';
 import { makeScheduler } from './scheduler.js';
@@ -135,11 +135,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const reserveFunds = provideEmptySeat(zcf, baggage, 'collateral');
 
   const addDeposit = (seat, amount) => {
-    const depositListForBrand = deposits.get(amount.brand);
-    deposits.set(
-      amount.brand,
-      harden([...depositListForBrand, { seat, amount }]),
-    );
+    appendToStoredArray(deposits, amount.brand, { seat, amount });
   };
 
   // Called "discount" rate even though it can be above or below 100%.

diff --git a/packages/smart-wallet/src/smartWallet.js b/packages/smart-wallet/src/smartWallet.js
@@ -7,15 +7,16 @@ import {
   PaymentShape,
   PurseShape,
 } from '@agoric/ertp';
+import { makeTypeGuards } from '@agoric/internal';
 import {
   observeNotifier,
   pipeTopicToStorage,
   prepareDurablePublishKit,
   SubscriberShape,
   TopicsRecordShape,
 } from '@agoric/notifier';
-import { makeTypeGuards } from '@agoric/internal';
 import { M, mustMatch } from '@agoric/store';
+import { appendToStoredArray } from '@agoric/store/src/stores/store-utils.js';
 import { makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data';
 import { makeStorageNodePathProvider } from '@agoric/zoe/src/contractSupport/durability.js';
 import { E } from '@endo/far';
@@ -377,12 +378,7 @@ export const prepareSmartWallet = (baggage, shared) => {
 
           // When there is no purse, save the payment into a queue.
           // It's not yet ever read but a future version of the contract can
-          if (queues.has(brand)) {
-            const extant = queues.get(brand);
-            queues.set(brand, harden([...extant, payment]));
-          } else {
-            queues.init(brand, harden([payment]));
-          }
+          appendToStoredArray(queues, brand, payment);
           return AmountMath.makeEmpty(brand);
         },
       },

diff --git a/packages/store/src/stores/store-utils.js b/packages/store/src/stores/store-utils.js
@@ -169,3 +169,19 @@ harden(makeAtomicProvider);
  * @template V
  * @typedef {ReturnType<typeof makeAtomicProvider<K, V>>} AtomicProvider<K, V>
  */
+
+/**
+ * @template K, V
+ * @param {MapStore<K, V[]>} mapStore
+ * @param {K} key
+ * @param {V} item
+ */
+export const appendToStoredArray = (mapStore, key, item) => {
+  if (mapStore.has(key)) {
+    const extant = mapStore.get(key);
+    mapStore.set(key, harden([...extant, item]));
+  } else {
+    mapStore.init(key, harden([item]));
+  }
+};
+harden(appendToStoredArray);
diff --git a/packages/zoe/src/contractSupport/ratio.js b/packages/zoe/src/contractSupport/ratio.js
@@ -373,7 +373,7 @@ export const parseRatio = (
     throw Fail`Invalid numeric data: ${numeric}`;
   }
 
-  const [whole, part = ''] = [match[1], match[2]];
+  const [_, whole, part = ''] = match;
   return makeRatio(
     BigInt(`${whole}${part}`),
     numeratorBrand,