@agoric/swingset-liveslots 0.10.3-u14.0 → 0.10.3-u16.1

package/test/{test-collection-schema-refcount.js → collection-schema-refcount.test.js}

@@ -1,10 +1,9 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
-import { kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeStartVat, makeBringOutYourDead } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/{test-collection-upgrade.js → collection-upgrade.test.js}

@@ -1,12 +1,10 @@
-/* eslint-disable no-await-in-loop, @jessie.js/no-nested-await, no-shadow */
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { M } from '@agoric/store';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
-import { kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeStartVat } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/{test-collections.js → collections.test.js}

@@ -1,8 +1,9 @@
+// @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { M } from '@agoric/store';
+import { makeCopyMap, makeCopySet } from '@endo/patterns';
 import { makeFakeCollectionManager } from '../tools/fakeVirtualSupport.js';
 
 const {
@@ -100,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}"`),
@@ -117,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}"`),
@@ -146,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}"`),
@@ -191,6 +206,89 @@ test('basic weak set operations', t => {
   );
 });
 
+function exerciseSetAddAll(t, weak, testStore) {
+  const allThatStuff = stuff.map(entry => entry[0]);
+
+  testStore.addAll(allThatStuff);
+  for (const elem of allThatStuff) {
+    t.truthy(testStore.has(elem));
+    testStore.delete(elem);
+  }
+  if (!weak) {
+    t.is(testStore.getSize(), 0);
+  }
+
+  testStore.addAll(makeCopySet(allThatStuff));
+  for (const elem of allThatStuff) {
+    t.truthy(testStore.has(elem));
+    testStore.delete(elem);
+  }
+  if (!weak) {
+    t.is(testStore.getSize(), 0);
+  }
+
+  t.throws(
+    () => testStore.addAll({ bogus: 47 }),
+    m(/provided data source is not iterable/),
+  );
+}
+
+test('set addAll', t => {
+  exerciseSetAddAll(t, false, makeScalarBigSetStore('test set'));
+});
+
+test('weak set addAll', t => {
+  exerciseSetAddAll(t, true, makeScalarBigWeakSetStore('test weak set'));
+});
+
+test('set snapshot', t => {
+  const testStore = makeScalarBigSetStore('test set');
+  const allThatStuff = stuff.map(entry => entry[0]);
+  testStore.addAll(allThatStuff);
+  t.deepEqual(testStore.snapshot(), makeCopySet(allThatStuff));
+});
+
+function exerciseMapAddAll(t, weak, testStore) {
+  testStore.addAll(stuff);
+  for (const [k, v] of stuff) {
+    t.truthy(testStore.has(k));
+    t.is(testStore.get(k), v);
+    testStore.delete(k);
+  }
+  if (!weak) {
+    t.is(testStore.getSize(), 0);
+  }
+
+  testStore.addAll(makeCopyMap(stuff));
+  for (const [k, v] of stuff) {
+    t.truthy(testStore.has(k));
+    t.is(testStore.get(k), v);
+    testStore.delete(k);
+  }
+  if (!weak) {
+    t.is(testStore.getSize(), 0);
+  }
+
+  t.throws(
+    () => testStore.addAll({ bogus: 47 }),
+    m(/provided data source is not iterable/),
+  );
+}
+
+test('map addAll', t => {
+  exerciseMapAddAll(t, false, makeScalarBigMapStore('test map'));
+});
+
+test('weak map addAll', t => {
+  exerciseMapAddAll(t, true, makeScalarBigWeakMapStore('test weak map'));
+});
+
+test('map snapshot', t => {
+  const testStore = makeScalarBigMapStore('test map');
+  testStore.addAll(stuff);
+  t.deepEqual(testStore.snapshot(), makeCopyMap(stuff));
+});
+
 test('constrain map key shape', t => {
   const stringsOnly = makeScalarBigMapStore('map key strings only', {
     keyShape: M.string(),
@@ -405,7 +503,9 @@ test('map fail on concurrent modification', t => {
   const primeMap = makeScalarBigMapStore('fmap', {
     keyShape: M.number(),
   });
-  primes.forEach((v, i) => primeMap.init(v, `${v} is prime #${i + 1}`));
+  for (const [i, v] of primes.entries()) {
+    primeMap.init(v, `${v} is prime #${i + 1}`);
+  }
 
   let iter = primeMap.keys()[Symbol.iterator]();
   t.deepEqual(iter.next(), { done: false, value: 2 });
@@ -433,7 +533,9 @@ test('set fail on concurrent modification', t => {
   const primeSet = makeScalarBigSetStore('fset', {
     keyShape: M.number(),
   });
-  primes.forEach(v => primeSet.add(v));
+  for (const v of primes) {
+    primeSet.add(v);
+  }
 
   let iter = primeSet.keys()[Symbol.iterator]();
   t.deepEqual(iter.next(), { done: false, value: 2 });
@@ -461,7 +563,9 @@ test('map ok with concurrent deletion', t => {
   const primeMap = makeScalarBigMapStore('fmap', {
     keyShape: M.number(),
   });
-  primes.forEach((v, i) => primeMap.init(v, `${v} is prime #${i + 1}`));
+  for (const [i, v] of primes.entries()) {
+    primeMap.init(v, `${v} is prime #${i + 1}`);
+  }
   const iter = primeMap.keys()[Symbol.iterator]();
   t.deepEqual(iter.next(), { done: false, value: 2 });
   primeMap.delete(3);
@@ -476,7 +580,9 @@ test('set ok with concurrent deletion', t => {
   const primeSet = makeScalarBigSetStore('fset', {
     keyShape: M.number(),
   });
-  primes.forEach(v => primeSet.add(v));
+  for (const v of primes) {
+    primeSet.add(v);
+  }
 
   const iter = primeSet.keys()[Symbol.iterator]();
   t.deepEqual(iter.next(), { done: false, value: 2 });
@@ -766,13 +872,6 @@ test('set queries', t => {
     symbolKrusty,
     undefined,
   ]);
-
-  // @ts-expect-error our BigSetStore has .entries, but not the SetStore type
-  t.deepEqual(Array.from(testStore.entries(M.number())), [
-    [-29, -29],
-    [3, 3],
-    [47, 47],
-  ]);
 });
 
 test('remotable sort order', t => {
@@ -798,7 +897,9 @@ test('complex map queries', t => {
   const primeStore = makeScalarBigMapStore('prime map', {
     keyShape: M.number(),
   });
-  primes.forEach((v, i) => primeStore.init(v, `${v} is prime #${i + 1}`));
+  for (const [i, v] of primes.entries()) {
+    primeStore.init(v, `${v} is prime #${i + 1}`);
+  }
 
   t.deepEqual(Array.from(primeStore.values()), [
     '2 is prime #1',
@@ -973,7 +1074,9 @@ test('complex set queries', t => {
   const primeStore = makeScalarBigSetStore('prime set', {
     keyShape: M.number(),
   });
-  primes.forEach(v => primeStore.add(v));
+  for (const v of primes) {
+    primeStore.add(v);
+  }
 
   t.deepEqual(
     Array.from(primeStore.values()),

package/test/{test-dropped-collection-weakrefs.js → dropped-collection-weakrefs.test.js}

@@ -1,8 +1,7 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { makeLiveSlots } from '../src/liveslots.js';
-import { kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeStartVat } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/{test-durabilityChecks.js → durabilityChecks.test.js}

@@ -1,5 +1,4 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { makeFakeVirtualStuff } from '../tools/fakeVirtualSupport.js';
@@ -16,6 +15,7 @@ async function runDurabilityCheckTest(t, relaxDurabilityRules) {
 
   const durableHolderKind = makeKindHandle('holder');
 
+  /** @param {any} held */
   const initHolder = (held = null) => ({ held });
   const holderBehavior = {
     hold: ({ state }, value) => {
@@ -269,5 +269,5 @@ async function runDurabilityCheckTest(t, relaxDurabilityRules) {
   }
 }
 
-test('durability checks (strict)', t => runDurabilityCheckTest(t, false));
-test('durability checks (relaxed)', t => runDurabilityCheckTest(t, true));
+test('durability checks (strict)', runDurabilityCheckTest, false);
+test('durability checks (relaxed)', runDurabilityCheckTest, true);

package/test/{test-facetiousness.js → facetiousness.test.js}

@@ -1,4 +1,3 @@
-import '@endo/init/debug.js';
 import test from 'ava';
 import {
   assessFacetiousness,
@@ -126,7 +125,7 @@ test('checkAndUpdateFacetiousness', t => {
   t.deepEqual(cauf({}, barfoo), barfoo);
 
   // a single Kind can only be redefined as another single
-  t.deepEqual(cauf(desc(), undefined), undefined);
+  t.is(cauf(desc(), undefined), undefined);
   t.throws(() => cauf(desc(), foo), {
     message: 'defineDurableKindMulti called for unfaceted KindHandle "tag"',
   });

package/test/gc-and-finalize.js

@@ -1,4 +1,4 @@
-/* global setImmediate */
+/* global setImmediate, FinalizationRegistry */
 
 /* A note on our GC terminology:
  *
@@ -89,3 +89,32 @@ export function makeGcAndFinalize(gcPower) {
     await new Promise(setImmediate);
   };
 }
+
+const fr = new FinalizationRegistry(({ promise, resolve }) => {
+  promise.result = true;
+  resolve(true);
+});
+
+const makeCollectedResultKit = () => {
+  /** @type {(val: true) => void} */
+  let resolve;
+
+  const promise = /** @type {Promise<true> & {result: boolean}} */ (
+    new Promise(r => {
+      resolve = r;
+    })
+  );
+  promise.result = false;
+  return {
+    promise,
+    // @ts-expect-error
+    resolve,
+  };
+};
+
+export function watchCollected(target) {
+  const kit = makeCollectedResultKit();
+  fr.register(target, kit);
+
+  return kit.promise;
+}

package/test/gc-helpers.js

@@ -1,8 +1,6 @@
-// eslint-disable-next-line import/order
-
 import { Far } from '@endo/marshal';
 import { M } from '@agoric/store';
-import { kslot, kser } from './kmarshal.js';
+import { kslot, kser } from '@agoric/kmarshal';
 import { parseVatSlot } from '../src/parseVatSlots.js';
 
 // These tests follow the model described in
@@ -168,6 +166,7 @@ export function* enumerateKeysWithPrefix(fakestore, prefix) {
     }
   }
 }
+harden(enumerateKeysWithPrefix);
 
 export function recognizersOf(v, baseref) {
   // the | is followed by the collectionID that can recognize baseref

package/test/{test-gc-sensitivity.js → gc-sensitivity.test.js}

@@ -1,9 +1,9 @@
+// @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeLiveSlots } from '../src/liveslots.js';
-import { kser } from './kmarshal.js';
 import { makeMockGC } from './mock-gc.js';
 import { makeMessage, makeStartVat } from './util.js';
 

package/test/{test-handled-promises.js → handled-promises.test.js}

@@ -1,6 +1,4 @@
-/* eslint-disable no-await-in-loop, @jessie.js/no-nested-await, no-shadow */
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
 import { Fail } from '@agoric/assert';
@@ -9,7 +7,7 @@ import { makePromiseKit } from '@endo/promise-kit';
 // Disabled to avoid circular dependencies.
 // import { makeStoreUtils } from '@agoric/vat-data/src/vat-data-bindings.js';
 // import { makeExoUtils } from '@agoric/vat-data/src/exo-utils.js';
-import { kslot, kser } from './kmarshal.js';
+import { kslot, kser } from '@agoric/kmarshal';
 import { setupTestLiveslots } from './liveslots-helpers.js';
 import { makeResolve, makeReject } from './util.js';
 
@@ -233,12 +231,12 @@ test('past-incarnation watched promises', async t => {
   t.deepEqual(getDispatchLogs(), [
     fulfillmentMessage(`p-${nextPImport()}`, 'created local promise: rejected'),
   ]);
-  t.deepEqual(
+  t.is(
     lastPImport - firstPImport + 1,
     4,
     'imported 4 promises (1 per dispatch)',
   );
-  t.deepEqual(lastPExport - firstPExport + 1, 1, 'exported 1 promise: first');
+  t.is(lastPExport - firstPExport + 1, 1, 'exported 1 promise: first');
 
   await dispatchMessage('watchLocalPromise', 'orphaned');
   t.deepEqual(getDispatchLogs(), [
@@ -260,12 +258,12 @@ test('past-incarnation watched promises', async t => {
     fulfillmentMessage(`p-${nextPImport()}`, 'watched local promise: rejected'),
     rejectionMessage(`p+${lastPExport}`, S),
   ]);
-  t.deepEqual(
+  t.is(
     lastPImport - firstPImport + 1,
     7,
     'imported 7 promises (1 per dispatch)',
   );
-  t.deepEqual(
+  t.is(
     lastPExport - firstPExport + 1,
     4,
     'exported 4 promises: first, orphaned, fulfilled, rejected',

package/test/{test-initial-vrefs.js → initial-vrefs.test.js}

@@ -1,10 +1,9 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/far';
+import { kunser } from '@agoric/kmarshal';
 import { M } from '@agoric/store';
 import { setupTestLiveslots } from './liveslots-helpers.js';
-import { kunser } from './kmarshal.js';
 
 function buildRootObject(vatPowers, vatParameters, baggage) {
   const vd = vatPowers.VatData;
@@ -148,5 +147,5 @@ test('vrefs', async t => {
   const expectedStore1Vref = `o+v${initialKindIDs.scalarMapStore}/5`;
   const store1Vref = (await run('getStore1')).slots[0];
   t.is(store1Vref, expectedStore1Vref);
-  t.deepEqual(kunser(JSON.parse(fakestore.get(`vc.5.s${'key'}`))), 'value');
+  t.is(kunser(JSON.parse(fakestore.get(`vc.5.s${'key'}`))), 'value');
 });

package/test/liveslots-helpers.js

@@ -1,6 +1,7 @@
 /* global WeakRef, FinalizationRegistry */
-import engineGC from './engine-gc.js';
+import { kser } from '@agoric/kmarshal';
 
+import engineGC from './engine-gc.js';
 import { waitUntilQuiescent } from './waitUntilQuiescent.js';
 import { makeGcAndFinalize } from './gc-and-finalize.js';
 import { makeDummyMeterControl } from './dummyMeterControl.js';
@@ -12,12 +13,11 @@ import {
   makeRetireExports,
   makeBringOutYourDead,
 } from './util.js';
-import { kser } from './kmarshal.js';
 
 /**
  * @param {object} [options]
- * @param {boolean} [options.skipLogging = false]
- * @param {Map<string, string>} [options.kvStore = new Map()]
+ * @param {boolean} [options.skipLogging]
+ * @param {Map<string, string>} [options.kvStore]
  */
 export function buildSyscall(options = {}) {
   const { skipLogging = false, kvStore: fakestore = new Map() } = options;
@@ -168,9 +168,9 @@ function makeRPMaker(nextNumber = 1) {
  * @param {string} vatName
  * @param {object} [options]
  * @param {boolean} [options.forceGC]
- * @param {Map<string, string>} [options.kvStore = new Map()]
+ * @param {Map<string, string>} [options.kvStore]
  * @param {number} [options.nextPromiseImportNumber]
- * @param {boolean} [options.skipLogging = false]
+ * @param {boolean} [options.skipLogging]
  */
 export async function setupTestLiveslots(
   t,

package/test/{test-liveslots-mock-gc.js → liveslots-mock-gc.test.js}

@@ -1,10 +1,10 @@
+// @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
+import { kslot, kser } from '@agoric/kmarshal';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
-import { kslot, kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import {
   makeMessage,