@agoric/swingset-liveslots 0.10.3-dev-77a85e2.0 → 0.10.3-dev-93d7fac.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-liveslots",
-  "version": "0.10.3-dev-77a85e2.0+77a85e2",
+  "version": "0.10.3-dev-93d7fac.0+93d7fac",
   "description": "SwingSet ocap support layer",
   "type": "module",
   "main": "src/index.js",
@@ -19,8 +19,8 @@
     "postpack": "git clean -f ':!src/types-index.d.ts' '*.d.ts*' '*.tsbuildinfo'"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-77a85e2.0+77a85e2",
-    "@agoric/store": "0.9.3-dev-77a85e2.0+77a85e2",
+    "@agoric/internal": "0.3.3-dev-93d7fac.0+93d7fac",
+    "@agoric/store": "0.9.3-dev-93d7fac.0+93d7fac",
     "@endo/env-options": "^1.1.8",
     "@endo/errors": "^1.2.9",
     "@endo/eventual-send": "^1.3.0",
@@ -34,7 +34,7 @@
     "@endo/promise-kit": "^1.1.9"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-77a85e2.0+77a85e2",
+    "@agoric/kmarshal": "0.1.1-dev-93d7fac.0+93d7fac",
     "ava": "^5.3.0"
   },
   "files": [
@@ -68,5 +68,5 @@
   "typeCoverage": {
     "atLeast": 75.24
   },
-  "gitHead": "77a85e22be3a5a9cde6068f85ecaa6a1da66f84f"
+  "gitHead": "93d7fac547fbc9a20c9b312d811010fa7aa37fec"
 }

package/src/watchedPromises.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watchedPromises.d.ts","sourceRoot":"","sources":["watchedPromises.js"],"names":[],"mappings":"AASA;;;;GAIG;AAEH;;;;;;;;;GASG;AACH,6IARG;IAAmB,OAAO,EAAlB,GAAC;IACiE,GAAG,EAArE,OAAO,wBAAwB,EAAE,uBAAuB;IACU,GAAG,EAArE,OAAO,2BAA2B,EAAE,oBAAoB;IAC7C,iBAAiB,EAA5B,GAAC;IACsD,gBAAgB,EAAvE,OAAO,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC;IACU,gBAAgB,EAAvE,OAAO,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC;IACb,kBAAkB,EAAlD,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO;CAChC;;6CAgHY,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,KACzB,IAAI;4BAiBJ,CAAC,EACO,CAAC,SAAR,GAAG,EAAG,cACT,OAAO,mBAAmB,EAAE,iBAAiB,mBAC7C,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,kBAC9B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,KAC/B,OAAO,YAAY,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;mBAmC3C,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,WAAW,OAAO,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI;EAsE3I;gCA9PY,CAAC,EACQ,CAAC,SAAT,GAAG,EAAG,gBACP,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"watchedPromises.d.ts","sourceRoot":"","sources":["watchedPromises.js"],"names":[],"mappings":"AASA;;;;GAIG;AAEH;;;;;;;;;GASG;AACH,6IARG;IAAmB,OAAO,EAAlB,GAAC;IACiE,GAAG,EAArE,OAAO,wBAAwB,EAAE,uBAAuB;IACU,GAAG,EAArE,OAAO,2BAA2B,EAAE,oBAAoB;IAC7C,iBAAiB,EAA5B,GAAC;IACsD,gBAAgB,EAAvE,OAAO,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC;IACU,gBAAgB,EAAvE,OAAO,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC;IACb,kBAAkB,EAAlD,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO;CAChC;;6CA+GY,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,KACzB,IAAI;4BAiBJ,CAAC,EACO,CAAC,SAAR,GAAG,EAAG,cACT,OAAO,mBAAmB,EAAE,iBAAiB,mBAC7C,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,kBAC9B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,KAC/B,OAAO,YAAY,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;mBAmC3C,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,WAAW,OAAO,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI;EAoE3I;gCA3PY,CAAC,EACQ,CAAC,SAAT,GAAG,EAAG,gBACP,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC"}

package/src/watchedPromises.js

@@ -36,13 +36,12 @@ export function makeWatchedPromiseManager({
   const { defineDurableKind } = vom;
 
   /**
-   * virtual Store (not durable) mapping vpid to Promise objects, to
-   * maintain the slotToVal registration until resolution. Without
-   * this, slotToVal would forget local Promises that aren't exported.
+   * Track promises watched in `buildRootObject` so `loadWatchedPromiseTable`
+   * can differentiate them from promises watched in a previous incarnation.
    *
-   * @type {MapStore<string, Promise<unknown>>}
+   * @type {Set<string> | null}
    */
-  let promiseRegistrations;
+  let buildRootObjectWatchedPromiseRefs;
 
   /**
    * watched promises by vpid: each entry is an array of watches on the
@@ -60,7 +59,7 @@ export function makeWatchedPromiseManager({
   let promiseWatcherByKindTable;
 
   function preparePromiseWatcherTables() {
-    promiseRegistrations = makeScalarBigMapStore('promiseRegistrations');
+    buildRootObjectWatchedPromiseRefs = new Set();
     let watcherTableID = syscall.vatstoreGet('watcherTableID');
     if (watcherTableID) {
       promiseWatcherByKindTable = convertSlotToVal(watcherTableID);
@@ -105,7 +104,7 @@ export function makeWatchedPromiseManager({
     function settle(value, wasFulfilled) {
       const watches = watchedPromiseTable.get(vpid);
       watchedPromiseTable.delete(vpid);
-      promiseRegistrations.delete(vpid);
+      buildRootObjectWatchedPromiseRefs?.delete(vpid);
       for (const watch of watches) {
         const [watcher, ...args] = watch;
         void Promise.resolve().then(() => {
@@ -139,16 +138,16 @@ export function makeWatchedPromiseManager({
    */
   function loadWatchedPromiseTable(revivePromise) {
     for (const vpid of watchedPromiseTable.keys()) {
-      if (promiseRegistrations.has(vpid)) {
+      if (buildRootObjectWatchedPromiseRefs?.has(vpid)) {
         // We're only interested in reconnecting the promises from the previous
         // incarnation. Any promise watched during buildRootObject would have
         // already created a registration.
         continue;
       }
       const p = revivePromise(vpid);
-      promiseRegistrations.init(vpid, p);
       pseudoThen(p, vpid);
     }
+    buildRootObjectWatchedPromiseRefs = null;
   }
 
   /**
@@ -235,11 +234,9 @@ export function makeWatchedPromiseManager({
       } else {
         watchedPromiseTable.init(vpid, harden([[watcher, ...args]]));
 
-        promiseRegistrations.init(vpid, p);
+        buildRootObjectWatchedPromiseRefs?.add(vpid);
 
-        // pseudoThen registers a settlement callback that will remove
-        // this promise from promiseRegistrations and
-        // watchedPromiseTable. To avoid triggering
+        // To avoid triggering
         // https://github.com/Agoric/agoric-sdk/issues/10757 and
         // preventing slotToVal cleanup, the `pseudoThen()` should
         // precede `maybeExportPromise()`. This isn't foolproof, but

package/test/gc-helpers.js

@@ -9,8 +9,8 @@ import { parseVatSlot } from '../src/parseVatSlots.js';
 let aWeakMapStore;
 let aWeakSetStore;
 
-export const mainHolderIdx = 5;
-export const mainHeldIdx = 6;
+export const mainHolderIdx = 4;
+export const mainHeldIdx = 5;
 
 export function buildRootObject(vatPowers) {
   const { VatData } = vatPowers;

package/test/handled-promises.test.js

@@ -588,8 +588,7 @@ test('watched local promises should not leak slotToVal entries', async t => {
 // The workaround doesn't handle this case because it learns about the
 // settlement before the virtual object system
 // See https://github.com/Agoric/agoric-sdk/issues/10757
-// prettier-ignore
-test.failing('watched imported promises should not leak slotToVal entries', async t => {
+test('watched imported promises should not leak slotToVal entries', async t => {
   const S = 'settlement';
   // cf. src/liveslots.js:initialIDCounters
   const firstPExport = 5;

package/test/initial-vrefs.test.js

@@ -70,34 +70,28 @@ test('initial vatstore contents', async t => {
   t.deepEqual(kunser(JSON.parse(get(`vc.1.|schemata`))), stringSchema);
 
   // then three tables for the promise watcher (one virtual, two durable)
-  t.is(getLabel(`vc.3.|schemata`), 'promiseWatcherByKind'); // durable
-  t.is(getLabel(`vc.4.|schemata`), 'watchedPromises'); // durable
-  // the promiseRegistrations table is not durable, and only gets vc.2
-  // on the first incarnation: it will get a new ID on subsequent
-  // incarnations
-  t.is(getLabel(`vc.2.|schemata`), `promiseRegistrations`); // virtual
+  t.is(getLabel(`vc.2.|schemata`), 'promiseWatcherByKind'); // durable
+  t.is(getLabel(`vc.3.|schemata`), 'watchedPromises'); // durable
 
   const watcherTableVref = get('watcherTableID');
   const watchedPromiseTableVref = get('watchedPromiseTableID');
-  t.is(watcherTableVref, `${dmsBase}/3`);
-  t.is(watchedPromiseTableVref, `${dmsBase}/4`);
+  t.is(watcherTableVref, `${dmsBase}/2`);
+  t.is(watchedPromiseTableVref, `${dmsBase}/3`);
 
   // baggage and the two durable promise-watcher tables are pinned
   t.is(get(`vom.rc.${baggageVref}`), '1');
   t.is(get(`vom.rc.${watcherTableVref}`), '1');
   t.is(get(`vom.rc.${watchedPromiseTableVref}`), '1');
 
-  // promiseRegistrations and promiseWatcherByKind arbitrary scalars as keys
-  const scalarSchema2 = { label: 'promiseRegistrations', keyShape: M.scalar() };
+  // promiseWatcherByKind arbitrary scalars as keys
   const scalarSchema3 = { label: 'promiseWatcherByKind', keyShape: M.scalar() };
-  t.deepEqual(kunser(JSON.parse(get(`vc.2.|schemata`))), scalarSchema2);
-  t.deepEqual(kunser(JSON.parse(get(`vc.3.|schemata`))), scalarSchema3);
+  t.deepEqual(kunser(JSON.parse(get(`vc.2.|schemata`))), scalarSchema3);
   // watchedPromises uses vref (string) keys
   const scalarStringSchema = {
     label: 'watchedPromises',
     keyShape: M.and(M.scalar(), M.string()),
   };
-  t.deepEqual(kunser(JSON.parse(get(`vc.4.|schemata`))), scalarStringSchema);
+  t.deepEqual(kunser(JSON.parse(get(`vc.3.|schemata`))), scalarStringSchema);
 });
 
 test('vrefs', async t => {
@@ -141,11 +135,11 @@ test('vrefs', async t => {
   const dh2Vref = (await run('getDinstance2')).slots[0];
   t.is(dh2Vref, expectedDH2Vref);
 
-  // the liveslots-created collections consume vc.1 through vc.4,
-  // leaving vc.5 for the first user-created collection
-  t.is(getLabel('vc.5.|schemata'), 'store1');
-  const expectedStore1Vref = `o+v${initialKindIDs.scalarMapStore}/5`;
+  // the liveslots-created collections consume vc.1 through vc.3,
+  // leaving vc.4 for the first user-created collection
+  t.is(getLabel('vc.4.|schemata'), 'store1');
+  const expectedStore1Vref = `o+v${initialKindIDs.scalarMapStore}/4`;
   const store1Vref = (await run('getStore1')).slots[0];
   t.is(store1Vref, expectedStore1Vref);
-  t.is(kunser(JSON.parse(fakestore.get(`vc.5.s${'key'}`))), 'value');
+  t.is(kunser(JSON.parse(fakestore.get(`vc.4.s${'key'}`))), 'value');
 });

package/test/liveslots-real-gc.test.js

@@ -289,7 +289,7 @@ avaRetry(test.serial, 'GC dispatch.dropExports', async t => {
   t.deepEqual(log.shift(), {
     type: 'vatstoreSet',
     key: 'idCounters',
-    value: '{"exportID":11,"collectionID":5,"promiseID":5}',
+    value: '{"exportID":11,"collectionID":4,"promiseID":5}',
   });
   t.deepEqual(log, []);
 
@@ -369,7 +369,7 @@ avaRetry(
     t.deepEqual(log.shift(), {
       type: 'vatstoreSet',
       key: 'idCounters',
-      value: '{"exportID":11,"collectionID":5,"promiseID":5}',
+      value: '{"exportID":11,"collectionID":4,"promiseID":5}',
     });
     t.deepEqual(log, []);
 

package/test/liveslots.test.js

@@ -713,7 +713,7 @@ test('capdata size limit on syscalls', async t => {
     const label = 'test';
     t.deepEqual(log.shift(), {
       type: 'vatstoreGet',
-      key: 'vc.5.|schemata',
+      key: 'vc.4.|schemata',
       result: JSON.stringify(kser({ label, keyShape: M.scalar() })),
     });
   };
@@ -723,7 +723,7 @@ test('capdata size limit on syscalls', async t => {
   gotSchema();
   t.deepEqual(log.shift(), {
     type: 'vatstoreGet',
-    key: 'vc.5.skey',
+    key: 'vc.4.skey',
     result: undefined,
   });
   expectFail();
@@ -735,7 +735,7 @@ test('capdata size limit on syscalls', async t => {
   gotSchema();
   t.deepEqual(log.shift(), {
     type: 'vatstoreGet',
-    key: 'vc.5.skey',
+    key: 'vc.4.skey',
     result: undefined,
   });
   expectFail();

package/test/storeGC/lifecycle.test.js

@@ -14,12 +14,12 @@ import { parseVatSlot } from '../../src/parseVatSlots.js';
 
 function getLastCollection(v) {
   // makeAndHold() uses makeScalarBigMapStore, and since we call it
-  // early, it always gets "store #6", in vref o+2/6 (o+2 means
-  // scalarMapStore, non-durable, and /6 means collectionID=6)
-  const vref = 'o+v2/6';
+  // early, it always gets "store #5", in vref o+2/5 (o+2 means
+  // scalarMapStore, non-durable, and /5 means collectionID=5)
+  const vref = 'o+v2/5';
   // double-check that at least the collectionID is right
   const { t, fakestore } = v;
-  t.is(JSON.parse(fakestore.get('idCounters')).collectionID, 7); // last was 6
+  t.is(JSON.parse(fakestore.get('idCounters')).collectionID, 6); // last was 5
   return vref;
 }
 

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

@@ -590,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.4.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.4.ssavedKindID ${vstr(kind)}`);
-  t.is(log.shift(), 'get vc.4.|entryCount => 0');
-  t.is(log.shift(), 'set vc.4.|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
@@ -609,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.4.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"}',
@@ -658,20 +658,18 @@ 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(), 'get watcherTableID => undefined');
+  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 watcherTableID o+d6/2');
+  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(), '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"}',
@@ -704,8 +702,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -715,12 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // This is what the finalizer would do if the local reference was dropped and GC'd
@@ -750,8 +746,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -762,12 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // drop export -- should delete
@@ -801,8 +795,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -811,12 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 2: export, drop export, drop local ref
@@ -838,8 +830,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -849,12 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // drop local ref -- should delete
@@ -879,8 +869,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -888,12 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 3: drop local ref with no prior export
@@ -919,20 +907,18 @@ test('virtual object gc', t => {
     ['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/1', '1'],
     ['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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 4: ref virtually, export, drop local ref, drop export
@@ -949,21 +935,19 @@ test('virtual object gc', t => {
     ['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/1', '1'],
     ['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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // export
   setExportStatus(`${tbase}/4`, 'reachable');
@@ -1001,8 +985,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -1011,14 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // drop local ref -- should not delete because ref'd virtually AND exported
   pretendGC(`${tbase}/5`, false);
@@ -1046,8 +1028,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -1056,15 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // drop local ref -- should not delete because ref'd virtually
   pretendGC(`${tbase}/6`, false);
@@ -1078,8 +1058,6 @@ test('virtual object gc', t => {
     ['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')],
@@ -1088,15 +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.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'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 });
 

package/tools/fakeVirtualSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fakeVirtualSupport.d.ts","sourceRoot":"","sources":["fakeVirtualSupport.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuQC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcC;AAED;;;mEA9HE,wBAEa,iDACiB,GAAI,gDAI/B,GAAI,4BACuB,iBACtB;kFAgD6D,iBAC/D;EAmFP;AAED;;;;;;;;;;GAUG;AACH,+CAPG;IAAyB,SAAS;IACR,oBAAoB;IACR,SAAS;IACV,OAAO;IACP,OAAO;IAClB,IAAI;CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAjFH,GAC9B,+IAKuB,GAAG;0EAQd,GAAG,uJAKV,GAAG;+HAeL,GAAG,+IAKiB,GAAG;oIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uEAzHJ,wBAEa,iDACiB,GAAI,gDAI/B,GAAI,4BACuB,iBACtB;sFAgD6D,iBAC/D;;EA+GP;AAED;;;;;;;;iEApG+B,GAC9B,+IAKuB,GAAG;sEAQd,GAAG,uJAKV,GAAG;2HAeL,GAAG,+IAKiB,GAAG;gIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;EA0DL;AAED;;;;;;;;;;;;EAMC"}
+{"version":3,"file":"fakeVirtualSupport.d.ts","sourceRoot":"","sources":["fakeVirtualSupport.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuQC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcC;AAED;;;mEAhIiB,wBAAmB,iDAIZ,GAAI,gDAE1B,GAAC,4BAGc,iBAAY;kFAkDJ,iBAAY;EAoFpC;AAED;;;;;;;;;;GAUG;AACH,+CAPG;IAAyB,SAAS;IACR,oBAAoB;IACR,SAAS;IACV,OAAO;IACP,OAAO;IAClB,IAAI;CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAjFH,GAC9B,+IAKuB,GAAG;0EAQd,GAAG,uJAKV,GAAG;+HAeL,GAAG,+IAKiB,GAAG;oIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uEA3HW,wBAAmB,iDAIZ,GAAI,gDAE1B,GAAC,4BAGc,iBAAY;sFAkDJ,iBAAY;;EAgHpC;AAED;;;;;;;;iEApG+B,GAC9B,+IAKuB,GAAG;sEAQd,GAAG,uJAKV,GAAG;2HAeL,GAAG,+IAKiB,GAAG;gIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;EA0DL;AAED;;;;;;;;;;;;EAMC"}