fix: introduce and use Store.entries()

Agoric · Mar 15, 2020 · b572d51 · b572d51
1 parent 442fd20
commit b572d51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js b/packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js
@@ -17,9 +17,9 @@ export async function makeWallet(
   pursesStateChangeHandler = noActionStateChangeHandler,
   inboxStateChangeHandler = noActionStateChangeHandler,
 ) {
-  const petnameToPurse = new Map();
+  const petnameToPurse = makeStore();
   const purseToIssuer = makeWeakStore();
-  const issuerPetnameToIssuer = new Map();
+  const issuerPetnameToIssuer = makeStore();
   const issuerToIssuerNames = makeWeakStore();
   const issuerToBrand = makeWeakStore();
   const brandToIssuer = makeStore();
@@ -124,7 +124,7 @@ export async function makeWallet(
   // === API
 
   async function addIssuer(issuerPetname, issuer, brandRegKey = undefined) {
-    issuerPetnameToIssuer.set(issuerPetname, issuer);
+    issuerPetnameToIssuer.init(issuerPetname, issuer);
     issuerToIssuerNames.init(issuer, { issuerPetname, brandRegKey });
     const [brand, mathName] = await Promise.all([
       E(issuer).getBrand(),
@@ -152,7 +152,7 @@ export async function makeWallet(
       updatePursesState(pursePetname, doNotUse),
     );
 
-    petnameToPurse.set(pursePetname, purse);
+    petnameToPurse.init(pursePetname, purse);
     purseToIssuer.init(purse, issuer);
     updatePursesState(pursePetname, purse);
   }
@@ -163,7 +163,7 @@ export async function makeWallet(
   }
 
   function getPurses() {
-    return Array.from(petnameToPurse);
+    return petnameToPurse.entries();
   }
 
   function getOfferDescriptions() {
@@ -301,7 +301,7 @@ export async function makeWallet(
   }
 
   function getIssuers() {
-    return Array.from(issuerPetnameToIssuer);
+    return issuerPetnameToIssuer.entries();
   }
 
   const hydrateHook = ([hookMethod, ...hookArgs] = []) => object => {

diff --git a/packages/store/src/store.js b/packages/store/src/store.js
@@ -39,6 +39,7 @@ function makeStore(keyName = 'key') {
     },
     keys: () => Array.from(store.keys()),
     values: () => Array.from(store.values()),
+    entries: () => Array.from(store.entries()),
   });
 }
 harden(makeStore);