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

package/test/test-handled-promises.js

@@ -1,360 +0,0 @@
-/* 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';
-import { M, provideLazy as provide } from '@agoric/store';
-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 { setupTestLiveslots } from './liveslots-helpers.js';
-import { makeResolve, makeReject } from './util.js';
-
-// eslint-disable-next-line no-unused-vars
-const compareEntriesByKey = ([ka], [kb]) => (ka < kb ? -1 : 1);
-
-// Paritally duplicates @agoric/vat-data to avoid circular dependencies.
-const makeExoUtils = VatData => {
-  const { defineDurableKind, makeKindHandle, watchPromise } = VatData;
-
-  const provideKindHandle = (baggage, kindName) =>
-    provide(baggage, `${kindName}_kindHandle`, () => makeKindHandle(kindName));
-
-  const emptyRecord = harden({});
-  const initEmpty = () => emptyRecord;
-
-  const defineDurableExoClass = (
-    kindHandle,
-    interfaceGuard,
-    init,
-    methods,
-    options,
-  ) =>
-    defineDurableKind(kindHandle, init, methods, {
-      ...options,
-      thisfulMethods: true,
-      interfaceGuard,
-    });
-
-  const prepareExoClass = (
-    baggage,
-    kindName,
-    interfaceGuard,
-    init,
-    methods,
-    options = undefined,
-  ) =>
-    defineDurableExoClass(
-      provideKindHandle(baggage, kindName),
-      interfaceGuard,
-      init,
-      methods,
-      options,
-    );
-
-  const prepareExo = (
-    baggage,
-    kindName,
-    interfaceGuard,
-    methods,
-    options = undefined,
-  ) => {
-    const makeSingleton = prepareExoClass(
-      baggage,
-      kindName,
-      interfaceGuard,
-      initEmpty,
-      methods,
-      options,
-    );
-    return provide(baggage, `the_${kindName}`, () => makeSingleton());
-  };
-
-  return {
-    defineDurableKind,
-    makeKindHandle,
-    watchPromise,
-
-    provideKindHandle,
-    defineDurableExoClass,
-    prepareExoClass,
-    prepareExo,
-  };
-};
-
-// cf. packages/SwingSet/test/vat-durable-promise-watcher.js
-const buildPromiseWatcherRootObject = (vatPowers, _vatParameters, baggage) => {
-  const { VatData } = vatPowers;
-  const { watchPromise } = VatData;
-  const { prepareExo } = makeExoUtils(VatData);
-  // const { makeScalarBigMapStore } = makeStoreUtils(VatData);
-  const PromiseWatcherI = M.interface('ExtraArgPromiseWatcher', {
-    onFulfilled: M.call(M.any(), M.string()).returns(),
-    onRejected: M.call(M.any(), M.string()).returns(),
-  });
-  const watcher = prepareExo(
-    baggage,
-    'DurablePromiseIgnorer',
-    PromiseWatcherI,
-    {
-      onFulfilled(_value, _name) {},
-      onRejected(_reason, _name) {},
-    },
-  );
-
-  const localPromises = new Map();
-
-  return Far('root', {
-    exportPromise: () => [Promise.resolve()],
-    createLocalPromise: (name, fulfillment, rejection) => {
-      !localPromises.has(name) || Fail`local promise already exists: ${name}`;
-      const { promise, resolve, reject } = makePromiseKit();
-      if (fulfillment !== undefined) {
-        resolve(fulfillment);
-      } else if (rejection !== undefined) {
-        reject(rejection);
-      }
-      localPromises.set(name, promise);
-      return `created local promise: ${name}`;
-    },
-    watchLocalPromise: name => {
-      localPromises.has(name) || Fail`local promise not found: ${name}`;
-      watchPromise(localPromises.get(name), watcher, name);
-      return `watched local promise: ${name}`;
-    },
-  });
-};
-const kvStoreDataV1 = Object.entries({
-  baggageID: 'o+d6/1',
-  idCounters: '{"exportID":11,"collectionID":5,"promiseID":9}',
-  kindIDID: '1',
-  storeKindIDTable:
-    '{"scalarMapStore":2,"scalarWeakMapStore":3,"scalarSetStore":4,"scalarWeakSetStore":5,"scalarDurableMapStore":6,"scalarDurableWeakMapStore":7,"scalarDurableSetStore":8,"scalarDurableWeakSetStore":9}',
-  'vc.1.sDurablePromiseIgnorer_kindHandle':
-    '{"body":"#\\"$0.Alleged: kind\\"","slots":["o+d1/10"]}',
-  'vc.1.sthe_DurablePromiseIgnorer':
-    '{"body":"#\\"$0.Alleged: DurablePromiseIgnorer\\"","slots":["o+d10/1"]}',
-  'vc.1.|entryCount': '2',
-  'vc.1.|nextOrdinal': '1',
-  'vc.1.|schemata':
-    '{"label":"baggage","body":"#{\\"keyShape\\":{\\"#tag\\":\\"match:string\\",\\"payload\\":[]}}","slots":[]}',
-  // non-durable
-  // 'vc.2.sp+6': '{"body":"#\\"&0\\"","slots":["p+6"]}',
-  // 'vc.2.|entryCount': '1',
-  // 'vc.2.|nextOrdinal': '1',
-  // 'vc.2.|schemata': '{"label":"promiseRegistrations","body":"#{\\"keyShape\\":{\\"#tag\\":\\"match:scalar\\",\\"payload\\":\\"#undefined\\"}}","slots":[]}',
-  'vc.3.|entryCount': '0',
-  'vc.3.|nextOrdinal': '1',
-  'vc.3.|schemata':
-    '{"label":"promiseWatcherByKind","body":"#{\\"keyShape\\":{\\"#tag\\":\\"match:scalar\\",\\"payload\\":\\"#undefined\\"}}","slots":[]}',
-  'vc.4.sp+6':
-    '{"body":"#[[\\"$0.Alleged: DurablePromiseIgnorer\\",\\"orphaned\\"]]","slots":["o+d10/1"]}',
-  'vc.4.sp-8':
-    '{"body":"#[[\\"$0.Alleged: DurablePromiseIgnorer\\",\\"unresolved\\"]]","slots":["o+d10/1"]}',
-  'vc.4.sp-9':
-    '{"body":"#[[\\"$0.Alleged: DurablePromiseIgnorer\\",\\"late-rejected\\"]]","slots":["o+d10/1"]}',
-  'vc.4.|entryCount': '3',
-  'vc.4.|nextOrdinal': '1',
-  'vc.4.|schemata':
-    '{"label":"watchedPromises","body":"#{\\"keyShape\\":{\\"#tag\\":\\"match:and\\",\\"payload\\":[{\\"#tag\\":\\"match:scalar\\",\\"payload\\":\\"#undefined\\"},{\\"#tag\\":\\"match:string\\",\\"payload\\":[]}]}}","slots":[]}',
-  'vom.dkind.10.descriptor':
-    '{"kindID":"10","tag":"DurablePromiseIgnorer","unfaceted":true}',
-  'vom.dkind.10.nextID': '2',
-  'vom.o+d10/1': '{}',
-  'vom.rc.o+d1/10': '1',
-  'vom.rc.o+d10/1': '3',
-  'vom.rc.o+d6/1': '1',
-  'vom.rc.o+d6/3': '1',
-  'vom.rc.o+d6/4': '1',
-  watchedPromiseTableID: 'o+d6/4',
-  watcherTableID: 'o+d6/3',
-});
-const kvStoreDataV1VpidsToReject = ['p+6', 'p-9'];
-const kvStoreDataV1KeysToDelete = ['vc.4.sp+6', 'vc.4.sp-9'];
-const kvStoreDataV1VpidsToKeep = ['p-8'];
-const kvStoreDataV1KeysToKeep = ['vc.4.sp-8'];
-
-test('past-incarnation watched promises', async t => {
-  const kvStore = new Map();
-  let { v, dispatch, dispatchMessage } = await setupTestLiveslots(
-    t,
-    buildPromiseWatcherRootObject,
-    'durable-promise-watcher',
-    { kvStore },
-  );
-  let vatLogs = v.log;
-
-  // Anchor promise counters upon which the other assertions depend.
-  const firstPImport = 1;
-  // cf. src/liveslots.js:initialIDCounters
-  const firstPExport = 5;
-  let lastPImport = firstPImport - 1;
-  let lastPExport = firstPExport - 1;
-  const nextPImport = () => (lastPImport += 1);
-  const nextPExport = () => (lastPExport += 1);
-  // Ignore vatstore syscalls.
-  const getDispatchLogs = () =>
-    vatLogs.splice(0).filter(m => !m.type.startsWith('vatstore'));
-  const settlementMessage = (vpid, rejected, value) => ({
-    type: 'resolve',
-    resolutions: [[vpid, rejected, kser(value)]],
-  });
-  const fulfillmentMessage = (vpid, value) =>
-    settlementMessage(vpid, false, value);
-  const rejectionMessage = (vpid, value) =>
-    settlementMessage(vpid, true, value);
-  const subscribeMessage = vpid => ({
-    type: 'subscribe',
-    target: vpid,
-  });
-  vatLogs.length = 0;
-  await dispatchMessage('exportPromise');
-  t.deepEqual(getDispatchLogs(), [
-    fulfillmentMessage(`p-${nextPImport()}`, [kslot(`p+${nextPExport()}`)]),
-    fulfillmentMessage(`p+${lastPExport}`, undefined),
-  ]);
-
-  const S = 'settlement';
-  await dispatchMessage('createLocalPromise', 'orphaned');
-  t.deepEqual(getDispatchLogs(), [
-    fulfillmentMessage(`p-${nextPImport()}`, 'created local promise: orphaned'),
-  ]);
-  await dispatchMessage('createLocalPromise', 'fulfilled', S);
-  t.deepEqual(getDispatchLogs(), [
-    fulfillmentMessage(
-      `p-${nextPImport()}`,
-      'created local promise: fulfilled',
-    ),
-  ]);
-  await dispatchMessage('createLocalPromise', 'rejected', undefined, S);
-  t.deepEqual(getDispatchLogs(), [
-    fulfillmentMessage(`p-${nextPImport()}`, 'created local promise: rejected'),
-  ]);
-  t.deepEqual(
-    lastPImport - firstPImport + 1,
-    4,
-    'imported 4 promises (1 per dispatch)',
-  );
-  t.deepEqual(lastPExport - firstPExport + 1, 1, 'exported 1 promise: first');
-
-  await dispatchMessage('watchLocalPromise', 'orphaned');
-  t.deepEqual(getDispatchLogs(), [
-    subscribeMessage(`p+${nextPExport()}`),
-    fulfillmentMessage(`p-${nextPImport()}`, 'watched local promise: orphaned'),
-  ]);
-  await dispatchMessage('watchLocalPromise', 'fulfilled');
-  t.deepEqual(getDispatchLogs(), [
-    subscribeMessage(`p+${nextPExport()}`),
-    fulfillmentMessage(
-      `p-${nextPImport()}`,
-      'watched local promise: fulfilled',
-    ),
-    fulfillmentMessage(`p+${lastPExport}`, S),
-  ]);
-  await dispatchMessage('watchLocalPromise', 'rejected');
-  t.deepEqual(getDispatchLogs(), [
-    subscribeMessage(`p+${nextPExport()}`),
-    fulfillmentMessage(`p-${nextPImport()}`, 'watched local promise: rejected'),
-    rejectionMessage(`p+${lastPExport}`, S),
-  ]);
-  t.deepEqual(
-    lastPImport - firstPImport + 1,
-    7,
-    'imported 7 promises (1 per dispatch)',
-  );
-  t.deepEqual(
-    lastPExport - firstPExport + 1,
-    4,
-    'exported 4 promises: first, orphaned, fulfilled, rejected',
-  );
-
-  // Simulate upgrade by starting from the non-empty kvStore.
-  // t.log(Object.fromEntries([...kvStore.entries()].sort(compareEntriesByKey)));
-  const clonedStore = new Map(kvStore);
-  ({ v, dispatch, dispatchMessage } = await setupTestLiveslots(
-    t,
-    buildPromiseWatcherRootObject,
-    'durable-promise-watcher-v2',
-    { kvStore: clonedStore, nextPromiseImportNumber: lastPImport + 1 },
-  ));
-  vatLogs = v.log;
-
-  // Simulate kernel rejection of promises orphaned by termination/upgrade of their decider vat.
-  const expectedDeletions = [...clonedStore.entries()].filter(entry =>
-    entry[1].includes('orphaned'),
-  );
-  t.true(expectedDeletions.length >= 1);
-  await dispatch(
-    makeReject(`p+${firstPExport + 1}`, kser('tomorrow never came')),
-  );
-  for (const [key, value] of expectedDeletions) {
-    t.false(clonedStore.has(key), `entry should be removed: ${key}: ${value}`);
-  }
-
-  // Verify that the data is still in loadable condition.
-  const finalClonedStore = new Map(clonedStore);
-  ({ v, dispatch, dispatchMessage } = await setupTestLiveslots(
-    t,
-    buildPromiseWatcherRootObject,
-    'durable-promise-watcher-final',
-    { kvStore: finalClonedStore, nextPromiseImportNumber: lastPImport + 1 },
-  ));
-  vatLogs = v.log;
-  vatLogs.length = 0;
-  await dispatchMessage('createLocalPromise', 'final', S);
-  await dispatchMessage('watchLocalPromise', 'final');
-  t.deepEqual(getDispatchLogs(), [
-    fulfillmentMessage(`p-${nextPImport()}`, 'created local promise: final'),
-    subscribeMessage(`p+${nextPExport()}`),
-    fulfillmentMessage(`p-${nextPImport()}`, 'watched local promise: final'),
-    fulfillmentMessage(`p+${lastPExport}`, S),
-  ]);
-});
-
-test('past-incarnation watched promises from original-format kvStore', async t => {
-  const kvStore = new Map(kvStoreDataV1);
-  for (const key of [
-    ...kvStoreDataV1KeysToDelete,
-    ...kvStoreDataV1KeysToKeep,
-  ]) {
-    t.true(kvStore.has(key), `key must be initially present: ${key}`);
-  }
-
-  let { v, dispatch, dispatchMessage } = await setupTestLiveslots(
-    t,
-    buildPromiseWatcherRootObject,
-    'durable-promise-watcher',
-    { kvStore, nextPromiseImportNumber: 100 },
-  );
-  let vatLogs = v.log;
-  for (const vpid of kvStoreDataV1VpidsToReject) {
-    await dispatch(makeReject(vpid, kser('tomorrow never came')));
-  }
-  for (const key of kvStoreDataV1KeysToDelete) {
-    t.false(kvStore.has(key), `key should be removed: ${key}`);
-  }
-  for (const key of kvStoreDataV1KeysToKeep) {
-    t.true(kvStore.has(key), `key should remain: ${key}`);
-  }
-
-  // Verify that the data is still in loadable condition.
-  const finalClonedStore = new Map(kvStore);
-  // eslint-disable-next-line no-unused-vars
-  ({ v, dispatch, dispatchMessage } = await setupTestLiveslots(
-    t,
-    buildPromiseWatcherRootObject,
-    'durable-promise-watcher-final',
-    { kvStore: finalClonedStore, nextPromiseImportNumber: 200 },
-  ));
-  vatLogs = v.log;
-  vatLogs.length = 0;
-  for (const vpid of kvStoreDataV1VpidsToKeep) {
-    await dispatch(makeResolve(vpid, kser('finally')));
-  }
-  for (const key of kvStoreDataV1KeysToKeep) {
-    t.false(finalClonedStore.has(key), `key should be removed: ${key}`);
-  }
-});

package/test/virtual-objects/test-state-shape.js

@@ -1,298 +0,0 @@
-import test from 'ava';
-import '@endo/init/debug.js';
-
-import { Far } from '@endo/marshal';
-import { M } from '@agoric/store';
-import { makeLiveSlots } from '../../src/liveslots.js';
-import { kser, kslot } from '../kmarshal.js';
-import { buildSyscall } from '../liveslots-helpers.js';
-import { makeStartVat, makeMessage } from '../util.js';
-import { makeMockGC } from '../mock-gc.js';
-import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
-
-function makeGenericRemotable(typeName) {
-  return Far(typeName, {
-    aMethod() {
-      return 'whatever';
-    },
-  });
-}
-const eph1 = makeGenericRemotable('ephemeral1');
-const eph2 = makeGenericRemotable('ephemeral2');
-
-const init = value => ({ value });
-const behavior = {
-  set: ({ state }, value) => (state.value = value),
-};
-
-// virtual/durable Kinds can specify a 'stateShape', which should be
-// enforced, both during initialization and subsequent state changes
-
-test('constrain state shape', t => {
-  const { vom } = makeFakeVirtualStuff();
-  const { defineKind } = vom;
-  const any = { value: M.any() };
-  const number = { value: M.number() };
-  const string = { value: M.string() };
-  const remotable = { value: M.remotable() };
-  const eph = { value: eph1 };
-
-  // M.any() allows anything
-  const makeA = defineKind('kindA', init, behavior, { stateShape: any });
-  makeA(eph1);
-  makeA(1);
-  makeA('string');
-  const a = makeA(1);
-  a.set(eph1);
-  a.set(2);
-  a.set('other string');
-
-  // M.number() requires a number
-  const numberFail = { message: /Must be a number/ };
-  const makeB = defineKind('kindB', init, behavior, { stateShape: number });
-  t.throws(() => makeB(eph1), numberFail);
-  const b = makeB(1);
-  t.throws(() => makeB('string'), numberFail);
-  t.throws(() => b.set(eph1), numberFail);
-  t.throws(() => b.set('string'), numberFail);
-
-  // M.string() requires a string
-  const stringFail = { message: /Must be a string/ };
-  const makeC = defineKind('kindC', init, behavior, { stateShape: string });
-  t.throws(() => makeC(eph1), stringFail);
-  const c = makeC('string');
-  t.throws(() => makeC(1), stringFail);
-  t.throws(() => c.set(eph1), stringFail);
-  t.throws(() => c.set(2), stringFail);
-
-  // M.remotable() requires any Remotable
-  const remotableFail = { message: /Must be a remotable/ };
-  const makeD = defineKind('kindD', init, behavior, { stateShape: remotable });
-  const d = makeD(eph1);
-  makeD(eph2);
-  t.throws(() => makeD(1), remotableFail);
-  t.throws(() => makeD('string'), remotableFail);
-  d.set(eph2);
-  t.throws(() => d.set(2), remotableFail);
-  t.throws(() => d.set('string'), remotableFail);
-
-  // using a specific Remotable object requires that exact object
-  const eph1Fail = { message: /Must be:.*Alleged: ephemeral1/ };
-  const makeE = defineKind('kindE', init, behavior, { stateShape: eph });
-  const e = makeE(eph1);
-  t.throws(() => makeE(eph2), eph1Fail);
-  t.throws(() => makeE(1), eph1Fail);
-  t.throws(() => makeE('string'), eph1Fail);
-  e.set(eph1);
-  t.throws(() => e.set(eph2), eph1Fail);
-  t.throws(() => e.set(2), eph1Fail);
-  t.throws(() => e.set('string'), eph1Fail);
-});
-
-// durable Kinds serialize and store their stateShape, which must
-// itself be durable
-
-test('durable state shape', t => {
-  // note: relaxDurabilityRules defaults to true in fake tools
-  const { vom } = makeFakeVirtualStuff({ relaxDurabilityRules: false });
-  const { makeKindHandle, defineDurableKind } = vom;
-
-  const make = (which, stateShape) => {
-    const kh = makeKindHandle(`kind${which}`);
-    return defineDurableKind(kh, init, behavior, { stateShape });
-  };
-
-  const makeKind1 = make(1);
-  makeKind1();
-
-  const makeKind2 = make(2);
-  makeKind2();
-
-  const makeKind3 = make(3, { value: M.any() });
-  const obj3 = makeKind3();
-
-  const makeKind4 = make(4, { value: M.string() });
-  const obj4 = makeKind4('string');
-
-  const makeKind5 = make(5, { value: M.remotable() });
-  const durableValueFail = { message: /value for "value" is not durable/ };
-  t.throws(() => makeKind5(eph1), durableValueFail);
-
-  const durableShapeFail = { message: /stateShape.*is not durable: slot 0 of/ };
-  t.throws(() => make(6, { value: eph1 }), durableShapeFail);
-
-  const makeKind7 = make(7, { value: obj4 }); // obj4 is durable
-  makeKind7(obj4);
-  const specificRemotableFail = { message: /kind3.*Must be:.*kind4/ };
-  t.throws(() => makeKind7(obj3), specificRemotableFail);
-});
-
-// durable Kinds maintain refcounts on their serialized stateShape
-
-test('durable stateShape refcounts', async t => {
-  const kvStore = new Map();
-  const { syscall: sc1 } = buildSyscall({ kvStore });
-  const gcTools = makeMockGC();
-
-  function build1(vatPowers, _vp, baggage) {
-    const { VatData } = vatPowers;
-    const { makeKindHandle, defineDurableKind } = VatData;
-
-    return Far('root', {
-      accept: _standard1 => 0, // assign it a vref
-      create: standard1 => {
-        const kh = makeKindHandle('shaped');
-        baggage.init('kh', kh);
-        const stateShape = { value: standard1 };
-        defineDurableKind(kh, init, behavior, { stateShape });
-      },
-    });
-  }
-
-  const makeNS1 = () => ({ buildRootObject: build1 });
-  const ls1 = makeLiveSlots(sc1, 'vatA', {}, {}, gcTools, undefined, makeNS1);
-  const startVat1 = makeStartVat(kser());
-  await ls1.dispatch(startVat1);
-  const rootA = 'o+0';
-
-  const standard1Vref = 'o-1';
-  await ls1.dispatch(makeMessage(rootA, 'accept', []));
-  t.falsy(ls1.testHooks.getReachableRefCount(standard1Vref));
-
-  await ls1.dispatch(makeMessage(rootA, 'create', [kslot(standard1Vref)]));
-
-  // using our 'standard1' object in stateShape causes its refcount to
-  // be incremented
-  t.is(ls1.testHooks.getReachableRefCount(standard1Vref), 1);
-
-  // ------
-
-  // Simulate upgrade by starting from the non-empty kvStore.
-  const clonedStore = new Map(kvStore);
-  const { syscall: sc2 } = buildSyscall({ kvStore: clonedStore });
-
-  function build2(vatPowers, vatParameters, baggage) {
-    const { VatData } = vatPowers;
-    const { defineDurableKind } = VatData;
-    const { standard2 } = vatParameters;
-    const kh = baggage.get('kh');
-    const stateShape = { value: standard2 };
-    defineDurableKind(kh, init, behavior, { stateShape });
-
-    return Far('root', {});
-  }
-
-  // to test refcount increment/decrement, we need to override the
-  // usual rule that the new version must exactly match the original
-  // stateShape
-  const options = { allowStateShapeChanges: true };
-  const makeNS2 = () => ({ buildRootObject: build2 });
-  const ls2 = makeLiveSlots(
-    sc2,
-    'vatA',
-    {},
-    options,
-    gcTools,
-    undefined,
-    makeNS2,
-  );
-
-  const standard2Vref = 'o-2';
-  const vp = { standard2: kslot(standard2Vref) };
-  const startVat2 = makeStartVat(kser(vp));
-  await ls2.dispatch(startVat2);
-
-  // redefining the durable kind, with a different 'standard' object,
-  // will decrement the standard1 refcount, and increment that of
-  // standard2
-
-  t.falsy(ls2.testHooks.getReachableRefCount(standard1Vref));
-  t.is(ls2.testHooks.getReachableRefCount(standard2Vref), 1);
-});
-
-test('durable stateShape must match', async t => {
-  const kvStore = new Map();
-  const { syscall: sc1 } = buildSyscall({ kvStore });
-  const gcTools = makeMockGC();
-
-  function build1(vatPowers, _vp, baggage) {
-    const { VatData } = vatPowers;
-    const { makeKindHandle, defineDurableKind } = VatData;
-
-    return Far('root', {
-      create: (obj1, obj2) => {
-        const kh = makeKindHandle('shaped');
-        baggage.init('kh', kh);
-        const stateShape = { x: obj1, y: obj2 };
-        defineDurableKind(kh, init, behavior, { stateShape });
-      },
-    });
-  }
-
-  const makeNS1 = () => ({ buildRootObject: build1 });
-  const ls1 = makeLiveSlots(sc1, 'vatA', {}, {}, gcTools, undefined, makeNS1);
-  const startVat1 = makeStartVat(kser());
-  await ls1.dispatch(startVat1);
-  const rootA = 'o+0';
-
-  const vref1 = 'o-1';
-  const vref2 = 'o-2';
-  await ls1.dispatch(
-    makeMessage(rootA, 'create', [kslot(vref1), kslot(vref2)]),
-  );
-
-  // the first version's state is { x: vref1, y: vref2 }
-
-  // ------
-
-  // Simulate upgrade by starting from the non-empty kvStore.
-  const clonedStore = new Map(kvStore);
-  const { syscall: sc2 } = buildSyscall({ kvStore: clonedStore });
-
-  function build2(vatPowers, vatParameters, baggage) {
-    const { VatData } = vatPowers;
-    const { defineDurableKind } = VatData;
-    const { obj1, obj2 } = vatParameters;
-    const kh = baggage.get('kh');
-    // several shapes that are not compatible
-    const shape1 = { x: obj1, y: M.any() };
-    const shape2 = { x: obj1 };
-    const shape3 = { x: obj1, y: obj2, z: M.string() };
-    const shape4 = { x: M.or(obj1, M.string()), y: obj2 };
-    const shape5 = { x: obj2, y: obj1 }; // wrong slots
-    const trial = shape => {
-      t.throws(
-        () => defineDurableKind(kh, init, behavior, { stateShape: shape }),
-        { message: /durable Kind stateShape mismatch/ },
-      );
-    };
-    trial(shape1);
-    trial(shape2);
-    trial(shape3);
-    trial(shape4);
-    trial(shape5);
-    const stateShape = { x: obj1, y: obj2 }; // the correct shape
-    defineDurableKind(kh, init, behavior, { stateShape });
-    t.pass();
-
-    return Far('root', {});
-  }
-
-  // we do *not* override allowStateShapeChanges
-  // const options = { allowStateShapeChanges: true };
-  const options = undefined;
-  const makeNS2 = () => ({ buildRootObject: build2 });
-  const ls2 = makeLiveSlots(
-    sc2,
-    'vatA',
-    {},
-    options,
-    gcTools,
-    undefined,
-    makeNS2,
-  );
-
-  const vp = { obj1: kslot(vref1), obj2: kslot(vref2) };
-  const startVat2 = makeStartVat(kser(vp));
-  await ls2.dispatch(startVat2);
-});