@agoric/swingset-liveslots 0.10.3-mainnet1B-dev-b0c1f78.0 → 0.10.3-orchestration-dev-096c4e8.0

package/test/virtual-objects/test-virtualObjectManager.js

@@ -1,12 +1,12 @@
+// @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
+import { kser, kslot } from '@agoric/kmarshal';
 import {
   makeFakeVirtualObjectManager,
   makeFakeVirtualStuff,
 } from '../../tools/fakeVirtualSupport.js';
 
-import { kser, kslot } from '../kmarshal.js';
 import { vstr } from '../util.js';
 
 function initThing(label = 'thing', counter = 0) {
@@ -128,6 +128,7 @@ test('multifaceted virtual objects', t => {
   flushStateCache();
   t.deepEqual(log.splice(0), [
     `get kindIDID => undefined`,
+    `get idCounters => undefined`,
     `set kindIDID 1`,
     `set vom.vkind.2.descriptor {"kindID":"2","tag":"multithing"}`,
     `set vom.${kid}/1 ${multiThingVal('foo', 1)}`,
@@ -203,6 +204,7 @@ test('virtual object operations', t => {
   const thing4 = makeThing('thing-4', 300); // [t4-0* t3-0* t2-0* t1-0*]
   // t4-0: 'thing-4' 300 0
   t.is(log.shift(), `get kindIDID => undefined`);
+  t.is(log.shift(), `get idCounters => undefined`);
   t.is(log.shift(), `set kindIDID 1`);
   t.is(log.shift(), `set vom.vkind.2.descriptor {"kindID":"2","tag":"thing"}`);
   t.is(log.shift(), `set vom.vkind.3.descriptor {"kindID":"3","tag":"zot"}`);
@@ -467,6 +469,7 @@ test('symbol named methods', t => {
   const thing2 = makeThing('thing-2', 100); // [t1-0* t2-0*]
   // t2-0: 'thing-2' 100 0
   t.is(log.shift(), `get kindIDID => undefined`);
+  t.is(log.shift(), `get idCounters => undefined`);
   t.is(log.shift(), `set kindIDID 1`);
   t.is(
     log.shift(),
@@ -587,12 +590,12 @@ test('durable kind IDs can be reanimated', t => {
 
   // Store it in the store without having used it
   placeToPutIt.init('savedKindID', kindHandle);
-  t.is(log.shift(), 'get vc.1.ssavedKindID => undefined');
+  t.is(log.shift(), 'get vc.4.ssavedKindID => undefined');
   t.is(log.shift(), `get vom.rc.${khid} => undefined`);
   t.is(log.shift(), `set vom.rc.${khid} 1`);
-  t.is(log.shift(), `set vc.1.ssavedKindID ${vstr(kind)}`);
-  t.is(log.shift(), 'get vc.1.|entryCount => 0');
-  t.is(log.shift(), 'set vc.1.|entryCount 1');
+  t.is(log.shift(), `set vc.4.ssavedKindID ${vstr(kind)}`);
+  t.is(log.shift(), 'get vc.4.|entryCount => 0');
+  t.is(log.shift(), 'set vc.4.|entryCount 1');
   t.deepEqual(log, []);
 
   // Forget its Representative
@@ -606,7 +609,7 @@ test('durable kind IDs can be reanimated', t => {
 
   // Fetch it from the store, which should reanimate it
   const fetchedKindID = placeToPutIt.get('savedKindID');
-  t.is(log.shift(), `get vc.1.ssavedKindID => ${vstr(kind)}`);
+  t.is(log.shift(), `get vc.4.ssavedKindID => ${vstr(kind)}`);
   t.is(
     log.shift(),
     'get vom.dkind.10.descriptor => {"kindID":"10","tag":"testkind"}',
@@ -647,6 +650,7 @@ test('virtual object gc', t => {
   });
 
   t.is(log.shift(), `get kindIDID => undefined`);
+  t.is(log.shift(), `get idCounters => undefined`);
   t.is(log.shift(), `set kindIDID 1`);
   const skit = [
     'storeKindIDTable',
@@ -654,9 +658,23 @@ test('virtual object gc', t => {
   ];
   t.is(log.shift(), `get storeKindIDTable => undefined`);
   t.is(log.shift(), `set ${skit[0]} ${skit[1]}`);
+  t.is(log.shift(), 'set vc.1.|nextOrdinal 1');
+  t.is(log.shift(), 'set vc.1.|entryCount 0');
+  t.is(log.shift(), 'get watcherTableID => undefined');
+  t.is(log.shift(), 'set vc.2.|nextOrdinal 1');
+  t.is(log.shift(), 'set vc.2.|entryCount 0');
+  t.is(log.shift(), 'set watcherTableID o+d6/2');
+  t.is(log.shift(), 'get vom.rc.o+d6/2 => undefined');
+  t.is(log.shift(), 'set vom.rc.o+d6/2 1');
+  t.is(log.shift(), 'get watchedPromiseTableID => undefined');
+  t.is(log.shift(), 'set vc.3.|nextOrdinal 1');
+  t.is(log.shift(), 'set vc.3.|entryCount 0');
+  t.is(log.shift(), 'set watchedPromiseTableID o+d6/3');
+  t.is(log.shift(), 'get vom.rc.o+d6/3 => undefined');
+  t.is(log.shift(), 'set vom.rc.o+d6/3 1');
   t.is(
     log.shift(),
-    `set vom.vkind.10.descriptor {"kindID":"10","tag":"thing"}`,
+    'set vom.vkind.10.descriptor {"kindID":"10","tag":"thing"}',
   );
   t.is(log.shift(), `set vom.vkind.11.descriptor {"kindID":"11","tag":"ref"}`);
   t.deepEqual(log, []);
@@ -682,6 +700,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/1`, minThing('thing #1')],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
@@ -691,8 +715,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 
   // This is what the finalizer would do if the local reference was dropped and GC'd
@@ -718,6 +746,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/1`, 'r'],
     [`vom.${tbase}/1`, minThing('thing #1')],
     [`vom.${tbase}/2`, minThing('thing #2')],
@@ -728,8 +762,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 
   // drop export -- should delete
@@ -759,6 +797,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -767,8 +811,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 
   // case 2: export, drop export, drop local ref
@@ -786,6 +834,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/2`, 's'],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
@@ -795,8 +849,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 
   // drop local ref -- should delete
@@ -817,6 +875,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/3`, minThing('thing #3')],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
@@ -824,8 +888,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 
   // case 3: drop local ref with no prior export
@@ -847,14 +915,24 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
     [`vom.${tbase}/6`, minThing('thing #6')],
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 
   // case 4: ref virtually, export, drop local ref, drop export
@@ -867,15 +945,25 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
     [`vom.${tbase}/6`, minThing('thing #6')],
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
   // export
   setExportStatus(`${tbase}/4`, 'reachable');
@@ -909,6 +997,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 'r'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -917,10 +1011,14 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     [`vom.rc.${tbase}/5`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
   // drop local ref -- should not delete because ref'd virtually AND exported
   pretendGC(`${tbase}/5`, false);
@@ -944,6 +1042,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 's'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -952,11 +1056,15 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     [`vom.rc.${tbase}/5`, '1'],
     [`vom.rc.${tbase}/6`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
   // drop local ref -- should not delete because ref'd virtually
   pretendGC(`${tbase}/6`, false);
@@ -966,6 +1074,12 @@ test('virtual object gc', t => {
   t.deepEqual(dumpStore(), [
     ['kindIDID', '1'],
     skit,
+    ['vc.1.|entryCount', '0'],
+    ['vc.1.|nextOrdinal', '1'],
+    ['vc.2.|entryCount', '0'],
+    ['vc.2.|nextOrdinal', '1'],
+    ['vc.3.|entryCount', '0'],
+    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 's'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -974,11 +1088,15 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/2', '1'],
+    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     [`vom.rc.${tbase}/5`, '1'],
     [`vom.rc.${tbase}/6`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/3'],
+    ['watcherTableID', 'o+d6/2'],
   ]);
 });
 

package/test/virtual-objects/test-vo-real-gc.js

@@ -1,13 +1,13 @@
-/* global WeakRef */
+// @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
-import { kser, kunser } from '../kmarshal.js';
+import { kser, kunser } from '@agoric/kmarshal';
 import { setupTestLiveslots } from '../liveslots-helpers.js';
+import { watchCollected } from '../gc-and-finalize.js';
 
 test('virtual object state writes', async t => {
-  let monitor;
+  let collected;
 
   const initData = { begin: 'ning' };
   const initStateData = { begin: kser(initData.begin) };
@@ -23,11 +23,11 @@ test('virtual object state writes', async t => {
     const root = Far('root', {
       make: () => {
         const thing = makeThing();
-        monitor = new WeakRef(thing);
+        collected = watchCollected(thing);
         return thing;
       },
       ping: thing => {
-        monitor = new WeakRef(thing);
+        collected = watchCollected(thing);
         return thing.ping();
       },
     });
@@ -56,7 +56,7 @@ test('virtual object state writes', async t => {
 
   // 'thing' is exported, but not held in RAM, so the Representative
   // should be dropped
-  t.falsy(monitor.deref());
+  t.true(collected.result);
 
   // Invoking a method, on the other hand, *does* require creation of
   // "state" and "context", and creation of "state" requires reading
@@ -70,5 +70,5 @@ test('virtual object state writes', async t => {
 
   // 'thing' is again dropped by RAM, so it should be dropped. If
   // "context" were erroneously retained, it would stick around.
-  t.falsy(monitor.deref());
+  t.true(collected.result);
 });

package/test/virtual-objects/test-weakcollections-vref-handling.js

@@ -1,9 +1,8 @@
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { makeFakeVirtualObjectManager } from '../../tools/fakeVirtualSupport.js';
 
-test('weakMap vref handling', async t => {
+test('weakMap vref handling', t => {
   const log = [];
   const {
     VirtualObjectAwareWeakMap,

package/tools/fakeVirtualSupport.js

@@ -1,14 +1,23 @@
-/* global WeakRef */
+/* global globalThis */
 /* eslint-disable max-classes-per-file */
 import { makeMarshal } from '@endo/marshal';
 import { assert } from '@agoric/assert';
-import { parseVatSlot } from '../src/parseVatSlots.js';
+import { isPromise } from '@endo/promise-kit';
 
+import { parseVatSlot } from '../src/parseVatSlots.js';
 import { makeVirtualReferenceManager } from '../src/virtualReferences.js';
 import { makeWatchedPromiseManager } from '../src/watchedPromises.js';
 import { makeFakeVirtualObjectManager } from './fakeVirtualObjectManager.js';
 import { makeFakeCollectionManager } from './fakeCollectionManager.js';
 
+const { Fail } = assert;
+
+const {
+  WeakRef: RealWeakRef,
+  WeakMap: RealWeakMap,
+  WeakSet: RealWeakSet,
+} = globalThis;
+
 class FakeFinalizationRegistry {
   // eslint-disable-next-line no-useless-constructor, no-empty-function
   constructor() {}
@@ -30,8 +39,6 @@ class FakeWeakRef {
   }
 }
 
-const RealWeakRef = WeakRef;
-
 export function makeFakeLiveSlotsStuff(options = {}) {
   let vrm;
   function setVrm(vrmToUse) {
@@ -45,6 +52,8 @@ export function makeFakeLiveSlotsStuff(options = {}) {
     log,
     FinalizationRegistry = FakeFinalizationRegistry,
     WeakRef = FakeWeakRef, // VRM uses this
+    WeakMap = RealWeakMap,
+    WeakSet = RealWeakSet,
     addToPossiblyDeadSet = () => {},
     addToPossiblyRetiredSet = () => {},
   } = options;
@@ -151,18 +160,16 @@ export function makeFakeLiveSlotsStuff(options = {}) {
     },
   };
 
-  let nextExportID = 1;
   function allocateExportID() {
-    const exportID = nextExportID;
-    nextExportID += 1;
-    return exportID;
+    return vrm.allocateNextID('exportID');
+  }
+
+  function allocatePromiseID() {
+    return vrm.allocateNextID('promiseID');
   }
 
-  let nextCollectionID = 1;
   function allocateCollectionID() {
-    const collectionID = nextCollectionID;
-    nextCollectionID += 1;
-    return collectionID;
+    return vrm.allocateNextID('collectionID');
   }
 
   // note: The real liveslots slotToVal() maps slots (vrefs) to a WeakRef,
@@ -193,7 +200,9 @@ export function makeFakeLiveSlotsStuff(options = {}) {
 
   function convertValToSlot(val) {
     if (!valToSlot.has(val)) {
-      const slot = `o+${allocateExportID()}`;
+      const slot = isPromise(val)
+        ? `p+${allocatePromiseID()}`
+        : `o+${allocateExportID()}`;
       valToSlot.set(val, slot);
       setValForSlot(slot, val);
     }
@@ -212,17 +221,23 @@ export function makeFakeLiveSlotsStuff(options = {}) {
       }
       return val;
     }
+    let result;
     if (virtual || durable) {
       if (vrm) {
         val = vrm.reanimate(slot);
         if (facet !== undefined) {
-          return vrm.getFacet(id, val, facet);
+          result = vrm.getFacet(id, val, facet);
         }
       } else {
         assert.fail('fake liveSlots stuff configured without vrm');
       }
     }
-    return val;
+    // eslint-disable-next-line no-use-before-define
+    registerEntry(baseRef, val, facet !== undefined);
+    if (!result) {
+      result = val;
+    }
+    return result;
   }
 
   const marshal = makeMarshal(convertValToSlot, convertSlotToVal, {
@@ -230,12 +245,15 @@ export function makeFakeLiveSlotsStuff(options = {}) {
   });
 
   function registerEntry(baseRef, val, valIsCohort) {
+    const { facet } = parseVatSlot(baseRef);
+    !facet ||
+      Fail`registerEntry(${baseRef} should not receive individual facets`;
     setValForSlot(baseRef, val);
     if (valIsCohort) {
       const { id } = parseVatSlot(baseRef);
-      vrm.getFacetNames(id).forEach((name, index) => {
+      for (const [index, name] of vrm.getFacetNames(id).entries()) {
         valToSlot.set(val[name], `${baseRef}:${index}`);
-      });
+      }
     } else {
       valToSlot.set(val, baseRef);
     }
@@ -270,6 +288,8 @@ export function makeFakeLiveSlotsStuff(options = {}) {
     deleteEntry,
     FinalizationRegistry,
     WeakRef,
+    WeakMap,
+    WeakSet,
     addToPossiblyDeadSet,
     addToPossiblyRetiredSet,
     dumpStore,
@@ -311,12 +331,17 @@ export function makeFakeWatchedPromiseManager(
     maybeExportPromise: fakeStuff.maybeExportPromise,
   });
 }
+
 /**
  * Configure virtual stuff with relaxed durability rules and fake liveslots
  *
  * @param {object} [options]
- * @param {number} [options.cacheSize=3]
- * @param {boolean} [options.relaxDurabilityRules=true]
+ * @param {number} [options.cacheSize]
+ * @param {boolean} [options.relaxDurabilityRules]
+ * @param {Map<any, any>} [options.fakeStore]
+ * @param {WeakMapConstructor} [options.WeakMap]
+ * @param {WeakSetConstructor} [options.WeakSet]
+ * @param {boolean} [options.weak]
  */
 export function makeFakeVirtualStuff(options = {}) {
   const actualOptions = {
@@ -326,11 +351,12 @@ export function makeFakeVirtualStuff(options = {}) {
   const { relaxDurabilityRules } = actualOptions;
   const fakeStuff = makeFakeLiveSlotsStuff(actualOptions);
   const vrm = makeFakeVirtualReferenceManager(fakeStuff, relaxDurabilityRules);
+  fakeStuff.setVrm(vrm);
   const vom = makeFakeVirtualObjectManager(vrm, fakeStuff);
   vom.initializeKindHandleKind();
-  fakeStuff.setVrm(vrm);
   const cm = makeFakeCollectionManager(vrm, fakeStuff, actualOptions);
   const wpm = makeFakeWatchedPromiseManager(vrm, vom, cm, fakeStuff);
+  wpm.preparePromiseWatcherTables();
   return { fakeStuff, vrm, vom, cm, wpm };
 }
 
@@ -338,9 +364,9 @@ export function makeStandaloneFakeVirtualObjectManager(options = {}) {
   const fakeStuff = makeFakeLiveSlotsStuff(options);
   const { relaxDurabilityRules = true } = options;
   const vrm = makeFakeVirtualReferenceManager(fakeStuff, relaxDurabilityRules);
+  fakeStuff.setVrm(vrm);
   const vom = makeFakeVirtualObjectManager(vrm, fakeStuff);
   vom.initializeKindHandleKind();
-  fakeStuff.setVrm(vrm);
   return vom;
 }
 
@@ -348,6 +374,7 @@ export function makeStandaloneFakeCollectionManager(options = {}) {
   const fakeStuff = makeFakeLiveSlotsStuff(options);
   const { relaxDurabilityRules = true } = options;
   const vrm = makeFakeVirtualReferenceManager(fakeStuff, relaxDurabilityRules);
+  fakeStuff.setVrm(vrm);
   return makeFakeCollectionManager(vrm, fakeStuff, options);
 }
 

package/tools/prepare-test-env.js

@@ -0,0 +1,13 @@
+/**
+ * Prepare Agoric SwingSet vat global environment for testing.
+ *
+ * Installs Hardened JS (and does lockdown), plus adds mocks for virtual objects
+ * and stores.
+ */
+
+import '@agoric/internal/src/install-ses-debug.js';
+
+import { reincarnate } from './setup-vat-data.js';
+
+// Install the VatData globals.
+reincarnate();

package/tools/setup-vat-data.js

@@ -0,0 +1,62 @@
+// @ts-check
+/* global globalThis */
+// This file produces the globalThis.VatData property outside of a running
+// SwingSet so that it can be used by '@agoric/vat-data' (which only *consumes*
+// `globalThis.VatData`) in code under test.
+import { makeFakeVirtualStuff } from './fakeVirtualSupport.js';
+
+const { WeakMap, WeakSet } = globalThis;
+
+/** @type {ReturnType<makeFakeVirtualStuff>} */
+let fakeVomKit;
+
+globalThis.VatData = harden({
+  // @ts-expect-error spread argument for non-rest parameter
+  defineKind: (...args) => fakeVomKit.vom.defineKind(...args),
+  // @ts-expect-error spread argument for non-rest parameter
+  defineKindMulti: (...args) => fakeVomKit.vom.defineKindMulti(...args),
+  // @ts-expect-error spread argument for non-rest parameter
+  defineDurableKind: (...args) => fakeVomKit.vom.defineDurableKind(...args),
+  defineDurableKindMulti: (...args) =>
+    // @ts-expect-error spread argument for non-rest parameter
+    fakeVomKit.vom.defineDurableKindMulti(...args),
+  makeKindHandle: tag => fakeVomKit.vom.makeKindHandle(tag),
+  canBeDurable: (...args) => fakeVomKit.vom.canBeDurable(...args),
+  providePromiseWatcher: (...args) =>
+    // @ts-expect-error spread argument for non-rest parameter
+    fakeVomKit.wpm.providePromiseWatcher(...args),
+  watchPromise: (p, watcher, ...args) =>
+    fakeVomKit.wpm.watchPromise(p, watcher, ...args),
+  makeScalarBigMapStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigMapStore(...args),
+  makeScalarBigWeakMapStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigWeakMapStore(...args),
+  makeScalarBigSetStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigSetStore(...args),
+  makeScalarBigWeakSetStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigWeakSetStore(...args),
+});
+
+export const reincarnate = (options = {}) => {
+  const { fakeStore = new Map(), fakeVomKit: fvk } = options;
+
+  if (options.fakeVomKit) {
+    fvk.vom.flushStateCache();
+    fvk.cm.flushSchemaCache();
+    fvk.vrm.flushIDCounters();
+  }
+
+  fakeVomKit = makeFakeVirtualStuff({
+    ...options,
+    fakeStore,
+    WeakMap,
+    WeakSet,
+  });
+
+  // @ts-expect-error toStringTag set imperatively so it doesn't show up in the type
+  globalThis.WeakMap = fakeVomKit.vom.VirtualObjectAwareWeakMap;
+  // @ts-expect-error ditto
+  globalThis.WeakSet = fakeVomKit.vom.VirtualObjectAwareWeakSet;
+
+  return { ...options, fakeStore, fakeVomKit };
+};