@agoric/swingset-liveslots 0.10.3-other-dev-8f8782b.0 → 0.10.3-other-dev-fbe72e7.0.fbe72e7

package/test/virtual-objects/{test-virtualObjectGC.js → virtualObjectGC.test.js}

@@ -1,12 +1,13 @@
+// @ts-nocheck
 import test from 'ava';
-import '@endo/init/debug.js';
 
 import { Far } from '@endo/marshal';
+import { krefOf, kser, kslot } from '@agoric/kmarshal';
+import { avaRetry } from '@agoric/internal/tools/avaRetry.js';
 import {
   setupTestLiveslots,
   findSyscallsByType,
 } from '../liveslots-helpers.js';
-import { krefOf, kser, kslot } from '../kmarshal.js';
 import { parseVatSlot } from '../../src/parseVatSlots.js';
 
 // Legs:
@@ -437,10 +438,10 @@ async function voLifeCycleTest1(t, isf) {
   await dispatchMessageSuccessfully('dropHeld');
   assertState(v, vref, false, 'erv');
 }
-test.serial('VO lifecycle 1 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 1 unfaceted', async t => {
   await voLifeCycleTest1(t, false);
 });
-test.serial('VO lifecycle 1 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 1 faceted', async t => {
   await voLifeCycleTest1(t, true);
 });
 
@@ -519,10 +520,10 @@ async function voLifeCycleTest2(t, isf) {
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), []);
 }
 
-test.serial('VO lifecycle 2 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 2 unfaceted', async t => {
   await voLifeCycleTest2(t, false);
 });
-test.serial('VO lifecycle 2 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 2 faceted', async t => {
   await voLifeCycleTest2(t, true);
 });
 
@@ -567,10 +568,10 @@ async function voLifeCycleTest3(t, isf) {
   t.deepEqual(findSyscallsByType(v.log, 'dropExports'), []);
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), []);
 }
-test.serial('VO lifecycle 3 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 3 unfaceted', async t => {
   await voLifeCycleTest3(t, false);
 });
-test.serial('VO lifecycle 3 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 3 faceted', async t => {
   await voLifeCycleTest3(t, true);
 });
 
@@ -600,10 +601,10 @@ async function voLifeCycleTest4(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 4 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 4 unfaceted', async t => {
   await voLifeCycleTest4(t, false);
 });
-test.serial('VO lifecycle 4 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 4 faceted', async t => {
   await voLifeCycleTest4(t, true);
 });
 
@@ -640,10 +641,10 @@ async function voLifeCycleTest5(t, isf) {
   t.deepEqual(findSyscallsByType(v.log, 'dropExports'), []);
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), []);
 }
-test.serial('VO lifecycle 5 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 5 unfaceted', async t => {
   await voLifeCycleTest5(t, false);
 });
-test.serial('VO lifecycle 5 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 5 faceted', async t => {
   await voLifeCycleTest5(t, true);
 });
 
@@ -689,10 +690,10 @@ async function voLifeCycleTest6(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 6 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 6 unfaceted', async t => {
   await voLifeCycleTest6(t, false);
 });
-test.serial('VO lifecycle 6 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 6 faceted', async t => {
   await voLifeCycleTest6(t, true);
 });
 
@@ -730,10 +731,10 @@ async function voLifeCycleTest7(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 7 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 7 unfaceted', async t => {
   await voLifeCycleTest7(t, false);
 });
-test.serial('VO lifecycle 7 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 7 faceted', async t => {
   await voLifeCycleTest7(t, true);
 });
 
@@ -779,15 +780,15 @@ async function voLifeCycleTest8(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 8 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 8 unfaceted', async t => {
   await voLifeCycleTest8(t, false);
 });
-test.serial('VO lifecycle 8 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 8 faceted', async t => {
   await voLifeCycleTest8(t, true);
 });
 
 // multifacet export test 1: no export
-test.serial('VO multifacet export 1', async t => {
+avaRetry(test.serial, 'VO multifacet export 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(
     t,
     buildRootObject,
@@ -808,7 +809,7 @@ test.serial('VO multifacet export 1', async t => {
 });
 
 // multifacet export test 2a: export A, drop A, retire A
-test.serial('VO multifacet export 2a', async t => {
+avaRetry(test.serial, 'VO multifacet export 2a', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vref = facetRef(true, thingVref(true, 2), '0');
@@ -836,7 +837,7 @@ test.serial('VO multifacet export 2a', async t => {
 });
 
 // multifacet export test 2b: export B, drop B, retire B
-test.serial('VO multifacet export 2b', async t => {
+avaRetry(test.serial, 'VO multifacet export 2b', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vref = facetRef(true, thingVref(true, 2), '1');
@@ -863,7 +864,7 @@ test.serial('VO multifacet export 2b', async t => {
 });
 
 // multifacet export test 3abba: export A, export B, drop B, drop A, retire
-test.serial('VO multifacet export 3abba', async t => {
+avaRetry(test.serial, 'VO multifacet export 3abba', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vrefA = facetRef(true, thingVref(true, 2), '0');
@@ -901,7 +902,7 @@ test.serial('VO multifacet export 3abba', async t => {
 });
 
 // multifacet export test 3abab: export A, export B, drop A, drop B, retire
-test.serial('VO multifacet export 3abab', async t => {
+avaRetry(test.serial, 'VO multifacet export 3abab', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vrefA = facetRef(true, thingVref(true, 2), '0');
@@ -938,7 +939,7 @@ test.serial('VO multifacet export 3abab', async t => {
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 });
 
-test.serial('VO multifacet markers only', async t => {
+avaRetry(test.serial, 'VO multifacet markers only', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(
     t,
     buildRootObject,
@@ -993,10 +994,10 @@ async function voRefcountManagementTest1(t, isf) {
   t.is(fakestore.get(`vom.rc.${baseRef}`), undefined);
   assertState(v, vref, false, 'erv');
 }
-test.serial('VO refcount management 1 unfaceted', async t => {
+avaRetry(test.serial, 'VO refcount management 1 unfaceted', async t => {
   await voRefcountManagementTest1(t, false);
 });
-test.serial('VO refcount management 1 faceted', async t => {
+avaRetry(test.serial, 'VO refcount management 1 faceted', async t => {
   await voRefcountManagementTest1(t, true);
 });
 
@@ -1034,10 +1035,10 @@ async function voRefcountManagementTest2(t, isf) {
   t.is(fakestore.get(`vom.rc.${baseRef}`), undefined);
   assertState(v, vref, false, 'erv');
 }
-test.serial('VO refcount management 2 unfaceted', async t => {
+avaRetry(test.serial, 'VO refcount management 2 unfaceted', async t => {
   await voRefcountManagementTest2(t, false);
 });
-test.serial('VO refcount management 2 faceted', async t => {
+avaRetry(test.serial, 'VO refcount management 2 faceted', async t => {
   await voRefcountManagementTest2(t, true);
 });
 
@@ -1084,15 +1085,15 @@ async function voRefcountManagementTest3(t, isf) {
   t.is(fakestore.get(`vom.${holderVrefs[1]}`), undefined);
   t.is(fakestore.get(`vom.${holderVrefs[2]}`), undefined);
 }
-test.serial('VO refcount management 3 unfaceted', async t => {
+avaRetry(test.serial, 'VO refcount management 3 unfaceted', async t => {
   await voRefcountManagementTest3(t, false);
 });
-test.serial('VO refcount management 3 faceted', async t => {
+avaRetry(test.serial, 'VO refcount management 3 faceted', async t => {
   await voRefcountManagementTest3(t, true);
 });
 
 // prettier-ignore
-test.serial('presence refcount management 1', async t => {
+avaRetry(test.serial, 'presence refcount management 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1131,7 +1132,7 @@ test.serial('presence refcount management 1', async t => {
 });
 
 // prettier-ignore
-test.serial('presence refcount management 2', async t => {
+avaRetry(test.serial, 'presence refcount management 2', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1169,7 +1170,7 @@ test.serial('presence refcount management 2', async t => {
 });
 
 // prettier-ignore
-test.serial('remotable refcount management 1', async t => {
+avaRetry(test.serial, 'remotable refcount management 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1212,7 +1213,7 @@ test.serial('remotable refcount management 1', async t => {
 });
 
 // prettier-ignore
-test.serial('remotable refcount management 2', async t => {
+avaRetry(test.serial, 'remotable refcount management 2', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1255,15 +1256,15 @@ async function voWeakKeyGCTest(t, isf) {
   t.is(testHooks.countWeakKeysForCollection(aWeakSet), 0);
   t.is(fakestore.get(`vom.${baseRef}`), undefined);
 }
-test.serial('verify VO weak key GC unfaceted', async t => {
+avaRetry(test.serial, 'verify VO weak key GC unfaceted', async t => {
   await voWeakKeyGCTest(t, false);
 });
-test.serial('verify VO weak key GC faceted', async t => {
+avaRetry(test.serial, 'verify VO weak key GC faceted', async t => {
   await voWeakKeyGCTest(t, true);
 });
 
 // prettier-ignore
-test.serial('verify presence weak key GC', async t => {
+avaRetry(test.serial, 'verify presence weak key GC', async t => {
   const { v, dispatchMessageSuccessfully, dispatchRetireImports, testHooks } =
         await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vref = 'o-5';
@@ -1314,7 +1315,7 @@ test.serial('verify presence weak key GC', async t => {
 // designate references to a non-VO.
 
 // prettier-ignore
-test.serial('VO holding non-VO', async t => {
+avaRetry(test.serial, 'VO holding non-VO', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports, dispatchRetireExports } =
         await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;

package/test/virtual-objects/{test-virtualObjectManager.js → virtualObjectManager.test.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) {
@@ -127,6 +127,7 @@ test('multifaceted virtual objects', t => {
 
   flushStateCache();
   t.deepEqual(log.splice(0), [
+    `get idCounters => undefined`,
     `get kindIDID => undefined`,
     `set kindIDID 1`,
     `set vom.vkind.2.descriptor {"kindID":"2","tag":"multithing"}`,
@@ -202,6 +203,7 @@ test('virtual object operations', t => {
   // t3-0: 'thing-3' 200 0
   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 idCounters => undefined`);
   t.is(log.shift(), `get kindIDID => undefined`);
   t.is(log.shift(), `set kindIDID 1`);
   t.is(log.shift(), `set vom.vkind.2.descriptor {"kindID":"2","tag":"thing"}`);
@@ -466,6 +468,7 @@ test('symbol named methods', t => {
   // t1-0: 'thing-1' 0 0
   const thing2 = makeThing('thing-2', 100); // [t1-0* t2-0*]
   // t2-0: 'thing-2' 100 0
+  t.is(log.shift(), `get idCounters => undefined`);
   t.is(log.shift(), `get kindIDID => undefined`);
   t.is(log.shift(), `set kindIDID 1`);
   t.is(
@@ -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.3.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.3.ssavedKindID ${vstr(kind)}`);
+  t.is(log.shift(), 'get vc.3.|entryCount => 0');
+  t.is(log.shift(), 'set vc.3.|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.3.ssavedKindID => ${vstr(kind)}`);
   t.is(
     log.shift(),
     'get vom.dkind.10.descriptor => {"kindID":"10","tag":"testkind"}',
@@ -646,6 +649,7 @@ test('virtual object gc', t => {
     },
   });
 
+  t.is(log.shift(), `get idCounters => undefined`);
   t.is(log.shift(), `get kindIDID => undefined`);
   t.is(log.shift(), `set kindIDID 1`);
   const skit = [
@@ -654,9 +658,21 @@ 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(), 'get watcherTableID => undefined');
+  t.is(log.shift(), 'set vc.1.|nextOrdinal 1');
+  t.is(log.shift(), 'set vc.1.|entryCount 0');
+  t.is(log.shift(), 'set watcherTableID o+d6/1');
+  t.is(log.shift(), 'get vom.rc.o+d6/1 => undefined');
+  t.is(log.shift(), 'set vom.rc.o+d6/1 1');
+  t.is(log.shift(), 'get watchedPromiseTableID => undefined');
+  t.is(log.shift(), 'set vc.2.|nextOrdinal 1');
+  t.is(log.shift(), 'set vc.2.|entryCount 0');
+  t.is(log.shift(), 'set watchedPromiseTableID 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(),
-    `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 +698,10 @@ 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'],
     [`vom.${tbase}/1`, minThing('thing #1')],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
@@ -691,8 +711,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/1', '1'],
+    ['vom.rc.o+d6/2', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // This is what the finalizer would do if the local reference was dropped and GC'd
@@ -718,6 +742,10 @@ 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'],
     [`vom.es.${tbase}/1`, 'r'],
     [`vom.${tbase}/1`, minThing('thing #1')],
     [`vom.${tbase}/2`, minThing('thing #2')],
@@ -728,8 +756,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/1', '1'],
+    ['vom.rc.o+d6/2', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // drop export -- should delete
@@ -759,6 +791,10 @@ 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'],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -767,8 +803,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/1', '1'],
+    ['vom.rc.o+d6/2', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 2: export, drop export, drop local ref
@@ -786,6 +826,10 @@ 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'],
     [`vom.es.${tbase}/2`, 's'],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
@@ -795,8 +839,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/1', '1'],
+    ['vom.rc.o+d6/2', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // drop local ref -- should delete
@@ -817,6 +865,10 @@ 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'],
     [`vom.${tbase}/3`, minThing('thing #3')],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
@@ -824,8 +876,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/1', '1'],
+    ['vom.rc.o+d6/2', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 3: drop local ref with no prior export
@@ -847,14 +903,22 @@ 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'],
     [`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/1', '1'],
+    ['vom.rc.o+d6/2', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 4: ref virtually, export, drop local ref, drop export
@@ -867,15 +931,23 @@ 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'],
     [`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/1', '1'],
+    ['vom.rc.o+d6/2', '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/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // export
   setExportStatus(`${tbase}/4`, 'reachable');
@@ -909,6 +981,10 @@ 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'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 'r'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -917,10 +993,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/1', '1'],
+    ['vom.rc.o+d6/2', '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/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // drop local ref -- should not delete because ref'd virtually AND exported
   pretendGC(`${tbase}/5`, false);
@@ -944,6 +1024,10 @@ 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'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 's'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -952,11 +1036,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/1', '1'],
+    ['vom.rc.o+d6/2', '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/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // drop local ref -- should not delete because ref'd virtually
   pretendGC(`${tbase}/6`, false);
@@ -966,6 +1054,10 @@ 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'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 's'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -974,11 +1066,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/1', '1'],
+    ['vom.rc.o+d6/2', '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/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 });
 

package/test/virtual-objects/{test-vo-real-gc.js → vo-real-gc.test.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 → weakcollections-vref-handling.test.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,