@agoric/swingset-liveslots 0.10.3-dev-dafc7c1.0 → 0.10.3-dev-57685bd.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-liveslots",
-  "version": "0.10.3-dev-dafc7c1.0+dafc7c1",
+  "version": "0.10.3-dev-57685bd.0+57685bd",
   "description": "SwingSet ocap support layer",
   "type": "module",
   "main": "src/index.js",
@@ -17,9 +17,9 @@
     "lint:eslint": "eslint ."
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-dafc7c1.0+dafc7c1",
-    "@agoric/internal": "0.3.3-dev-dafc7c1.0+dafc7c1",
-    "@agoric/store": "0.9.3-dev-dafc7c1.0+dafc7c1",
+    "@agoric/assert": "0.6.1-dev-57685bd.0+57685bd",
+    "@agoric/internal": "0.3.3-dev-57685bd.0+57685bd",
+    "@agoric/store": "0.9.3-dev-57685bd.0+57685bd",
     "@endo/eventual-send": "^0.17.5",
     "@endo/exo": "^0.2.5",
     "@endo/far": "^0.2.21",
@@ -63,5 +63,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dafc7c1708977aaa55e245dc09a73859cf1df192"
+  "gitHead": "57685bd3ed65c1ace377736e049252b9283eb945"
 }

package/src/collectionManager.js

@@ -50,6 +50,14 @@ function throwNotDurable(value, slotIndex, serializedValue) {
   Fail`value is not durable: ${value} at slot ${q(slotIndex)} of ${serializedValue.body}`;
 }
 
+function failNotFound(key, label) {
+  Fail`key ${key} not found in collection ${q(label)}`;
+}
+
+function failNotIterable(value) {
+  Fail`provided data source is not iterable: ${value}`;
+}
+
 function prefixc(collectionID, dbEntryKey) {
   return `vc.${collectionID}.${dbEntryKey}`;
 }
@@ -339,24 +347,26 @@ export function makeCollectionManager(
       const { keyShape } = getSchema();
       if (!matches(key, keyShape)) {
         return false;
-      }
-      if (passStyleOf(key) === 'remotable') {
+      } else if (passStyleOf(key) === 'remotable') {
         return getOrdinal(key) !== undefined;
       } else {
         return syscall.vatstoreGet(keyToDBKey(key)) !== undefined;
       }
     }
 
+    function mustGet(key, label) {
+      if (passStyleOf(key) === 'remotable' && getOrdinal(key) === undefined) {
+        failNotFound(key, label);
+      }
+      const dbKey = keyToDBKey(key);
+      const result = syscall.vatstoreGet(dbKey) || failNotFound(key, label);
+      return { dbKey, result };
+    }
+
     function get(key) {
       const { keyShape, label } = getSchema();
       mustMatch(key, keyShape, makeInvalidKeyTypeMsg(label));
-      if (passStyleOf(key) === 'remotable' && getOrdinal(key) === undefined) {
-        throw Fail`key ${key} not found in collection ${q(label)}`;
-      }
-      const result = syscall.vatstoreGet(keyToDBKey(key));
-      if (!result) {
-        throw Fail`key ${key} not found in collection ${q(label)}`;
-      }
+      const { result } = mustGet(key, label);
       return unserializeValue(JSON.parse(result));
     }
 
@@ -427,9 +437,7 @@ export function makeCollectionManager(
           }
         }
       }
-      const dbKey = keyToDBKey(key);
-      const rawBefore = syscall.vatstoreGet(dbKey);
-      rawBefore || Fail`key ${key} not found in collection ${q(label)}`;
+      const { dbKey, result: rawBefore } = mustGet(key, label);
       const before = JSON.parse(rawBefore);
       vrm.updateReferenceCounts(before.slots, after.slots);
       syscall.vatstoreSet(dbKey, JSON.stringify(after));
@@ -438,12 +446,7 @@ export function makeCollectionManager(
     function deleteInternal(key) {
       const { keyShape, label } = getSchema();
       mustMatch(key, keyShape, makeInvalidKeyTypeMsg(label));
-      if (passStyleOf(key) === 'remotable' && getOrdinal(key) === undefined) {
-        throw Fail`key ${key} not found in collection ${q(label)}`;
-      }
-      const dbKey = keyToDBKey(key);
-      const rawValue = syscall.vatstoreGet(dbKey);
-      rawValue || Fail`key ${key} not found in collection ${q(label)}`;
+      const { dbKey, result: rawValue } = mustGet(key, label);
       const value = JSON.parse(rawValue);
       const doMoreGC1 = value.slots.map(vrm.removeReachableVref).some(b => b);
       syscall.vatstoreDelete(dbKey);
@@ -479,18 +482,15 @@ export function makeCollectionManager(
       const end = prefix(coverEnd); // exclusive
 
       const generationAtStart = currentGenerationNumber;
-      function checkGen() {
-        if (generationAtStart !== currentGenerationNumber) {
-          Fail`keys in store cannot be added to during iteration`;
-        }
-      }
+      const checkGen = () =>
+        currentGenerationNumber === generationAtStart ||
+        Fail`keys in store cannot be added to during iteration`;
 
       const needToMatchKey = !matchAny(keyPatt);
       const needToMatchValue = !matchAny(valuePatt);
 
-      // we always get the dbKey, but we might not need to unserialize it
+      // we might not need to unserialize the dbKey or get the dbValue
       const needKeys = yieldKeys || needToMatchKey;
-      // we don't always need the dbValue
       const needValues = yieldValues || needToMatchValue;
 
       /**
@@ -631,11 +631,10 @@ export function makeCollectionManager(
 
     const addAllToSet = elems => {
       if (typeof elems[Symbol.iterator] !== 'function') {
-        if (Object.isFrozen(elems) && isCopySet(elems)) {
-          elems = getCopySetKeys(elems);
-        } else {
-          Fail`provided data source is not iterable: ${elems}`;
-        }
+        elems =
+          Object.isFrozen(elems) && isCopySet(elems)
+            ? getCopySetKeys(elems)
+            : failNotIterable(elems);
       }
       for (const elem of elems) {
         addToSet(elem);
@@ -644,11 +643,10 @@ export function makeCollectionManager(
 
     const addAllToMap = mapEntries => {
       if (typeof mapEntries[Symbol.iterator] !== 'function') {
-        if (Object.isFrozen(mapEntries) && isCopyMap(mapEntries)) {
-          mapEntries = getCopyMapEntries(mapEntries);
-        } else {
-          Fail`provided data source is not iterable: ${mapEntries}`;
-        }
+        mapEntries =
+          Object.isFrozen(mapEntries) && isCopyMap(mapEntries)
+            ? getCopyMapEntries(mapEntries)
+            : failNotIterable(mapEntries);
       }
       for (const [key, value] of mapEntries) {
         if (has(key)) {

package/test/test-collections.js

@@ -101,6 +101,12 @@ function exerciseMapOperations(t, collectionName, testStore) {
     () => testStore.set(86, 'not work'),
     m(`key 86 not found in collection "${collectionName}"`),
   );
+  t.throws(
+    () => testStore.set(somethingMissing, 'not work'),
+    m(
+      `key "[Alleged: something missing]" not found in collection "${collectionName}"`,
+    ),
+  );
   t.throws(
     () => testStore.init(47, 'already there'),
     m(`key 47 already registered in collection "${collectionName}"`),
@@ -118,11 +124,17 @@ function exerciseMapOperations(t, collectionName, testStore) {
   t.is(testStore.get(somethingElse), something);
 
   testStore.delete(47);
+  testStore.delete(something);
   t.falsy(testStore.has(47));
+  t.falsy(testStore.has(something));
   t.throws(
     () => testStore.get(47),
     m(`key 47 not found in collection "${collectionName}"`),
   );
+  t.throws(
+    () => testStore.get(something),
+    m(`key "[Alleged: something]" not found in collection "${collectionName}"`),
+  );
   t.throws(
     () => testStore.delete(22),
     m(`key 22 not found in collection "${collectionName}"`),
@@ -147,7 +159,9 @@ function exerciseSetOperations(t, collectionName, testStore) {
   t.notThrows(() => testStore.add(47));
 
   testStore.delete(47);
+  testStore.delete(something);
   t.falsy(testStore.has(47));
+  t.falsy(testStore.has(something));
   t.throws(
     () => testStore.delete(22),
     m(`key 22 not found in collection "${collectionName}"`),