@agoric/swingset-liveslots 0.10.3-u19.2 → 0.10.3-u21.0

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-helpers.d.ts

@@ -57,6 +57,7 @@ export function setupTestLiveslots(t: import("ava").ExecutionContext, buildRootO
     dispatchDropExports: (...vrefs: any[]) => Promise<void>;
     dispatchRetireExports: (...vrefs: any[]) => Promise<void>;
     dispatchRetireImports: (...vrefs: any[]) => Promise<void>;
+    nextPImport: () => string;
     testHooks: any;
 }>;
 export function findSyscallsByType(log: any, type: any): any;

package/test/liveslots-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveslots-helpers.d.ts","sourceRoot":"","sources":["liveslots-helpers.js"],"names":[],"mappings":"AAgBA;;;;GAIG;AACH,uCAHG;IAA0B,WAAW;IACC,OAAO;CAAC;;;;;;;;;;;;;;;;EA2GhD;AAED;;;GA2BC;AAUD;;;;;;;;;;GAUG;AACH,sCAVW,OAAO,KAAK,EAAE,gBAAgB,sCAE9B,MAAM,YAEd;IAA0B,OAAO;IACK,OAAO;IACpB,uBAAuB;IACtB,WAAW;IACf,aAAa,GAA3B,GAAG;CAAyB;;;;;;;;;;;;;;GA4GtC;AAED,6DAEC"}
+{"version":3,"file":"liveslots-helpers.d.ts","sourceRoot":"","sources":["liveslots-helpers.js"],"names":[],"mappings":"AAgBA;;;;GAIG;AACH,uCAHG;IAA0B,WAAW;IACC,OAAO;CAAC;;;;;;;;;;;;;;;;EA2GhD;AAED;;;GA2BC;AAUD;;;;;;;;;;GAUG;AACH,sCAVW,OAAO,KAAK,EAAE,gBAAgB,sCAE9B,MAAM,YAEd;IAA0B,OAAO;IACK,OAAO;IACpB,uBAAuB;IACtB,WAAW;IACf,aAAa,GAA3B,GAAG;CAAyB;;;;;;;;;;;;;;;GA6GtC;AAED,6DAEC"}

package/test/liveslots-helpers.js

@@ -278,6 +278,7 @@ export async function setupTestLiveslots(
     dispatchDropExports,
     dispatchRetireExports,
     dispatchRetireImports,
+    nextPImport: nextRP,
     testHooks,
   };
 }

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

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import test from 'ava';
+import { avaRetry } from '@agoric/internal/tools/avaRetry.js';
 
 import { kslot, kunser } from '@agoric/kmarshal';
 import {
@@ -14,12 +15,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;
 }
 
@@ -66,7 +67,7 @@ function assertState(v, vref, reachable, erv) {
 // different test.
 
 // test 1: lerv -> Lerv -> LerV -> Lerv -> lerv
-test.serial('store lifecycle 1', async t => {
+avaRetry(test.serial, 'store lifecycle 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(
     t,
     buildRootObject,
@@ -94,7 +95,7 @@ test.serial('store lifecycle 1', async t => {
 
 // test 2: lerv -> Lerv -> LerV -> lerV -> LerV -> LERV -> lERV -> LERV ->
 //   lERV -> LERV -> lERV -> leRV -> LeRV -> leRV -> LeRV -> LerV
-test.serial('store lifecycle 2', async t => {
+avaRetry(test.serial, 'store lifecycle 2', async t => {
   const {
     v,
     dispatchMessageSuccessfully,
@@ -170,7 +171,7 @@ test.serial('store lifecycle 2', async t => {
 });
 
 // test 3: lerv -> Lerv -> LerV -> LERV -> LeRV -> leRV -> lerV -> lerv
-test.serial('store lifecycle 3', async t => {
+avaRetry(test.serial, 'store lifecycle 3', async t => {
   const {
     v,
     dispatchMessageSuccessfully,
@@ -211,7 +212,7 @@ test.serial('store lifecycle 3', async t => {
 });
 
 // test 4: lerv -> Lerv -> LERv -> LeRv -> lerv
-test.serial('store lifecycle 4', async t => {
+avaRetry(test.serial, 'store lifecycle 4', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
 
@@ -239,7 +240,7 @@ test.serial('store lifecycle 4', async t => {
 });
 
 // test 5: lerv -> Lerv -> LERv -> LeRv -> Lerv -> lerv
-test.serial('store lifecycle 5', async t => {
+avaRetry(test.serial, 'store lifecycle 5', async t => {
   const {
     v,
     dispatchMessageSuccessfully,
@@ -277,7 +278,7 @@ test.serial('store lifecycle 5', async t => {
 });
 
 // test 6: lerv -> Lerv -> LERv -> LeRv -> LeRV -> LeRv -> LeRV -> leRV -> lerv
-test.serial('store lifecycle 6', async t => {
+avaRetry(test.serial, 'store lifecycle 6', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
 
@@ -322,7 +323,7 @@ test.serial('store lifecycle 6', async t => {
 });
 
 // test 7: lerv -> Lerv -> LERv -> lERv -> LERv -> lERv -> lerv
-test.serial('store lifecycle 7', async t => {
+avaRetry(test.serial, 'store lifecycle 7', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
 
@@ -361,7 +362,7 @@ test.serial('store lifecycle 7', async t => {
 });
 
 // test 8: lerv -> Lerv -> LERv -> LERV -> LERv -> LERV -> lERV -> lERv -> lerv
-test.serial('store lifecycle 8', async t => {
+avaRetry(test.serial, 'store lifecycle 8', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
 

package/test/util.d.ts

@@ -12,7 +12,7 @@ export function buildDispatch(onDispatchCallback?: (d: unknown) => void): {
  * @param {unknown} result
  */
 export function makeMessage(target: unknown, method: string | symbol, args?: any[], result?: unknown): unknown[];
-export function makeStartVat(vatParameters: any): any[];
+export function makeStartVat(vatParametersCapData?: import("@endo/marshal").CapData<string>): (string | import("@endo/marshal").CapData<string>)[];
 export function makeBringOutYourDead(): string[];
 export function makeResolutions(resolutions: any): any[];
 export function makeResolve(target: any, result: any): any[];

package/test/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,mDAFW,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI;;;EAwC9B;AAED;;;;;GAKG;AACH,oCALW,OAAO,UACP,MAAM,GAAG,MAAM,SACf,GAAG,EAAE,WACL,OAAO,aAOjB;AAED,wDAEC;AAED,iDAEC;AAED,yDAGC;AAED,6DAGC;AAED,2EAIC;AAED,qEAGC;AAED,uEAGC;AAED,uEAGC;;qBAjGoB,eAAe"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAKA;;GAEG;AACH,mDAFW,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI;;;EAwC9B;AAED;;;;;GAKG;AACH,oCALW,OAAO,UACP,MAAM,GAAG,MAAM,SACf,GAAG,EAAE,WACL,OAAO,aAOjB;AAED,mJAEC;AAED,iDAEC;AAED,yDAGC;AAED,6DAGC;AAED,2EAIC;AAED,qEAGC;AAED,uEAGC;AAED,uEAGC;;qBAjGoB,eAAe"}

package/test/util.js

@@ -59,8 +59,8 @@ export function makeMessage(target, method, args = [], result = null) {
   return vatDeliverObject;
 }
 
-export function makeStartVat(vatParameters) {
-  return harden(['startVat', vatParameters]);
+export function makeStartVat(vatParametersCapData = kser(undefined)) {
+  return harden(['startVat', vatParametersCapData]);
 }
 
 export function makeBringOutYourDead() {