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

package/tools/vo-test-harness.js

@@ -0,0 +1,143 @@
+import { Far } from '@endo/marshal';
+import { setupTestLiveslots } from '../test/liveslots-helpers.js';
+
+// This file contains a test harness for virtual objects. runVOTest()
+// is to to help verify that a VO can be garbage collected and then
+// reloaded from persistent storage while maintaining functionality.
+
+// Testing VO swapping with runVOTest:
+//
+// Step 1: import the necessary harness paraphernalia
+//
+//   import { test, runVOTest } from '@agoric/swingset-vat/tools/vo-test-harness.js';
+//
+// `test` is the regular Ava test object that you'd normally import from
+// `@agoric/swingset-vat/tools/prepare-test-env-ava.js`.  The test harness will
+// import it for you, since it needs to set up some test things itself.
+//
+// Step 2: write three functions that you will pass to the test harness
+//
+// `prepare(VatData)` should perform any necessary environmental setup that the
+// virtual object kind under test will require.  In particular, this includes
+// executing any necessary `defineKind` or `defineDurableKind` calls to
+// establish the VO itself.  The `VatData` parameter is a regular `VatData`
+// object that can be used to obtain functions like `defineKind`.
+//
+// `makeTestObject()` should create and return an instance of the VO to be tested.
+//
+// `testTestObject(obj, phase)` should execute whatever actual testing and test
+// assertions you care to perform to verify your VO kind.  `obj` will be a
+// reference to an in-memory representative of the virtual object being tested
+// and `phase` will be a string, either 'before' or 'after', indicating whether
+// this instance of the object is before or after having been swapped out of
+// memory and then reloaded.  A correctly functioning VO should, among other
+// things, behave exactly the same in both cases.
+//
+// Step 3: write an Ava test that invokes the test harness
+//
+// The outer portion of this should be a conventional Ava test written in the
+// conventional way, e.g.:
+//
+// test('test name', async t => {
+//   ...your test here...
+// });
+//
+// The body of your test most likely will enclose the three functions described
+// above, since your `testTestObject` function (and possibly the others,
+// depending on how you code things) will need access to the `t` object in order
+// to execute test assertions.  Then, from inside your test invoke:
+//
+//   await runVOTest(t, prepare, makeTestObject, testTestObject);
+//
+// This will:
+//   1 - execute the `prepare` function
+//   2 - create a test object instance via `makeTestObject`
+//   3 - run `testTestObject` on the test object (this is the 'before' phase)
+//   4 - drop all in-memory references to the test object and force a GC pass
+//   5 - run `testTestObject` on the test object *again* (this is the 'after' phase)
+//
+// The key thing that the test harness provides for you is step 4, which
+// packages up some awkward boilerplate that's a bit of mysterious if you're not
+// already pretty familiar with how the VO GC mechanism works (or perhaps even
+// if you are).
+//
+// Note: It is critical that none of your own code retain any in-memory
+// references to the test object beyond step 3.  However, another key service
+// that the test harness provides is to detect if you did this and if so fail
+// the test.  One use of the test harness is to verify that you aren't
+// accidentally holding such references when you didn't mean to.
+//
+// The SwingSet test `vo-test-harness/test-vo-test-harness.js` is a test of the
+// VO test harness itself, but can be used as a simple example of how to set
+// things up.
+
+export async function runVOTest(t, prepare, makeTestObject, testTestObject) {
+  function buildRootObject(vatPowers) {
+    const { VatData } = vatPowers;
+    const { defineKind } = VatData;
+
+    const freeChecker = new WeakSet();
+
+    const makeSlug = defineKind('slug', label => ({ label }), {
+      getLabel: ({ state }) => state.label,
+    });
+    const cacheDisplacer = makeSlug('cacheDisplacer');
+
+    const makeHolder = defineKind('holder', (held = null) => ({ held }), {
+      setValue: ({ state }, value) => {
+        state.held = value;
+      },
+      getValue: ({ state }) => state.held,
+    });
+    const holder = makeHolder();
+
+    let held = null;
+
+    prepare(VatData);
+
+    function displaceCache() {
+      return cacheDisplacer.getLabel();
+    }
+
+    return Far('root', {
+      makeAndHold() {
+        held = makeTestObject();
+        freeChecker.add(held);
+        displaceCache();
+      },
+      storeHeld() {
+        holder.setValue(held);
+        displaceCache();
+      },
+      dropHeld() {
+        held = null;
+        displaceCache();
+      },
+      fetchAndHold() {
+        held = holder.getValue();
+        t.falsy(
+          freeChecker.has(held),
+          'somebody continues to hold test object',
+        );
+        displaceCache();
+      },
+      testHeld(phase) {
+        testTestObject(held, phase);
+      },
+    });
+  }
+
+  const { dispatchMessage } = await setupTestLiveslots(
+    t,
+    buildRootObject,
+    'bob',
+    { forceGC: true, skipLogging: true },
+  );
+
+  await dispatchMessage('makeAndHold');
+  await dispatchMessage('testHeld', 'before');
+  await dispatchMessage('storeHeld');
+  await dispatchMessage('dropHeld');
+  await dispatchMessage('fetchAndHold');
+  await dispatchMessage('testHeld', 'after');
+}

package/CHANGELOG.md

@@ -1,61 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-### [0.10.3-u11.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-liveslots@0.10.2...@agoric/swingset-liveslots@0.10.3-u11.0) (2023-08-24)
-
-**Note:** Version bump only for package @agoric/swingset-liveslots
-
-
-
-
-
-### [0.10.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-liveslots@0.10.1...@agoric/swingset-liveslots@0.10.2) (2023-06-02)
-
-**Note:** Version bump only for package @agoric/swingset-liveslots
-
-
-
-
-
-### [0.10.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-liveslots@0.10.0...@agoric/swingset-liveslots@0.10.1) (2023-05-24)
-
-**Note:** Version bump only for package @agoric/swingset-liveslots
-
-
-
-
-
-## 0.10.0 (2023-05-19)
-
-
-### Features
-
-* better diagnostic for failed reanimate ([c0c9c94](https://github.com/Agoric/agoric-sdk/commit/c0c9c9433648d520aa2bcdbadbbfe877831567c7)), closes [Error#1](https://github.com/Agoric/Error/issues/1)
-* **swingset-liveslots:** label virtual instances ([4191eb6](https://github.com/Agoric/agoric-sdk/commit/4191eb62d0e64048c3c715e5f71a53a747267350))
-* add APIs for tracking/debugging undesired object retention (aka "leaks") ([0a7221b](https://github.com/Agoric/agoric-sdk/commit/0a7221b3c04f3b2894c30346fa2ea6fb0130c046)), closes [#7318](https://github.com/Agoric/agoric-sdk/issues/7318)
-* move liveslots and specific tests to a new package ([0921a89](https://github.com/Agoric/agoric-sdk/commit/0921a8903b72cfefdf05a5906bcfb826cac1cc2f)), closes [#6596](https://github.com/Agoric/agoric-sdk/issues/6596)
-
-
-### Bug Fixes
-
-* **liveslots:** allow new Kind upgrade to add new facets ([6bc6694](https://github.com/Agoric/agoric-sdk/commit/6bc6694968e6d2f529e7c91ec1efb11fdff2e2d3)), closes [#7437](https://github.com/Agoric/agoric-sdk/issues/7437)
-* **liveslots:** retain WeakRefs to voAware collections ([3935723](https://github.com/Agoric/agoric-sdk/commit/393572396781afd17691e1366abeba696228a24e)), closes [#7371](https://github.com/Agoric/agoric-sdk/issues/7371)
-* **swingset-liveslots:** prevent VOM infinite loop if `globalThis.WeakSet` etc are replaced ([d7b35e2](https://github.com/Agoric/agoric-sdk/commit/d7b35e28715a715ef510f2717e0040fa017caab4))
-* adding dup entries to virtual sets is OK ([c81d367](https://github.com/Agoric/agoric-sdk/commit/c81d3677d8085eb4debe5baa416816ff94d582cf)), closes [#7234](https://github.com/Agoric/agoric-sdk/issues/7234)
-* code updates for new marshal ([292f971](https://github.com/Agoric/agoric-sdk/commit/292f971769db69e61782f96638c2f687c3f95ac2))
-* **SwingSet:** Don't send stopVat during upgrade ([5cc47d2](https://github.com/Agoric/agoric-sdk/commit/5cc47d2d8892690f8c1653630b41dd64cc42d73b)), closes [#6650](https://github.com/Agoric/agoric-sdk/issues/6650)
-* **types:** return value of deleter ([457f576](https://github.com/Agoric/agoric-sdk/commit/457f5765b9fc0a693e6eb5e6644ddf4af3b791db))
-* move many type definitions from swingset to liveslots ([727143d](https://github.com/Agoric/agoric-sdk/commit/727143d5562498e2e3013c34304f229b4dd11da5))
-* move rejectAllPromises from stopVat to kernels-side upgradeVat ([d79623f](https://github.com/Agoric/agoric-sdk/commit/d79623f3fb3b87653dba1c71eb1153711c9d962c)), closes [#6694](https://github.com/Agoric/agoric-sdk/issues/6694)
-* Move upgrade-time abandonExports responsibility into the kernel ([66ac657](https://github.com/Agoric/agoric-sdk/commit/66ac657d51d3d1be61ee4a6e9a621a664086ee57)), closes [#6696](https://github.com/Agoric/agoric-sdk/issues/6696)
-* only the exo api change ([5cf3bf1](https://github.com/Agoric/agoric-sdk/commit/5cf3bf10a71dd02094365a66e87032e5d17d004f))
-* **liveslots:** use Map for vrefStatus, not object ([1456e2a](https://github.com/Agoric/agoric-sdk/commit/1456e2ae006bb1c702383cedda5e5c407968840e))
-* **swingset:** move a bunch of types from swingset to swingset-liveslots ([14f9bb0](https://github.com/Agoric/agoric-sdk/commit/14f9bb00c82c085dc647f23b6c90b26e6a0a6dfd))
-* **swingset-liveslots:** Move promise rejection responsibility into the kernel ([dd29ff3](https://github.com/Agoric/agoric-sdk/commit/dd29ff35c5dc72efbbf7087849182aa7f04b2bb1)), closes [#6694](https://github.com/Agoric/agoric-sdk/issues/6694)
-* add 'v'/'d' virtual/durable annotations to vrefs ([b859e92](https://github.com/Agoric/agoric-sdk/commit/b859e92fe041415d6e34250f672a10ad927aa33e)), closes [#6695](https://github.com/Agoric/agoric-sdk/issues/6695)
-* update description of "FINALIZED" state ([809f366](https://github.com/Agoric/agoric-sdk/commit/809f3660c083467e76deb1487015cb24205a801d))
-* without assertKeyPattern ([#7035](https://github.com/Agoric/agoric-sdk/issues/7035)) ([c9fcd7f](https://github.com/Agoric/agoric-sdk/commit/c9fcd7f82757732435cd96f3377e4fbfb6586ce7))
-* **swingset-liveslots:** copy helper files to new liveslots package ([be7229f](https://github.com/Agoric/agoric-sdk/commit/be7229f7217c1ecc523069a57945a372f4a1e00e))
-* **swingset-liveslots:** update imports of helper files ([0b4b38a](https://github.com/Agoric/agoric-sdk/commit/0b4b38a1f9efbb3e1e860172b0b802548d18ae2e))

package/test/kmarshal.js

@@ -1,79 +0,0 @@
-import { Far, makeMarshal, passStyleOf } from '@endo/marshal';
-import { assert } from '@agoric/assert';
-
-// Simple wrapper for serializing and unserializing marshalled values inside the
-// kernel, where we don't actually want to use clists nor actually allocate real
-// objects, but instead to stay entirely within the domain of krefs.  This is
-// used to enable syntactic manipulation of serialized values while remaining
-// agnostic about the internal details of the serialization encoding.
-
-const refMap = new WeakMap();
-
-export const kslot = (kref, iface) => {
-  assert.typeof(kref, 'string');
-  if (iface && iface.startsWith('Alleged: ')) {
-    // Encoder prepends "Alleged: " to iface string, but the decoder doesn't strip it
-    // Unclear whether it's the decoder or me who is wrong
-    iface = iface.slice(9);
-  }
-  if (
-    kref.startsWith('p') ||
-    kref.startsWith('kp') ||
-    kref.startsWith('lp') ||
-    kref.startsWith('rp')
-  ) {
-    // TODO: temporary hack because smallcaps encodes promise references
-    // differently from remotable object references, and the current version of
-    // the smallcaps decoder annoyingly insists that if the encoded body string
-    // says a slot is a promise, then convertSlotToVal had better by damn return
-    // an actual Promise, even if, as in the intended use case here, we neither
-    // want nor need a promise, nor the overhead of a map to keep track of it
-    // with.  This behavior is in service of defense against a hypothesized
-    // security issue whose exact nature has largely been forgotton in the
-    // months since it was first encountered.  MarkM is currently researching
-    // what the problem was thought to have been, to see if it is real and to
-    // understand it if so.  This will eventually result in either changes to
-    // the smallcaps encoding or to the marshal setup API to support the purely
-    // manipulative use case.  In the meantime, this ugliness...
-    const p = new Promise(() => undefined);
-    refMap.set(p, kref);
-    return harden(p);
-  } else {
-    const o = Far(iface, {
-      iface: () => iface,
-      getKref: () => `${kref}`,
-    });
-    return o;
-  }
-};
-
-export const krefOf = obj => {
-  const fromMap = refMap.get(obj);
-  if (fromMap) {
-    return fromMap;
-  }
-  // When krefOf() is called as part of kmarshal.serialize, marshal
-  // will only give it things that are 'remotable' (Promises and the
-  // Far objects created by kslot()).  When krefOf() is called by
-  // kernel code (as part of extractSingleSlot() or the vat-comms
-  // equivalent), it ought to throw if 'obj' is not one of the Far
-  // objects created by our kslot().
-  assert.equal(passStyleOf(obj), 'remotable', obj);
-  const getKref = obj.getKref;
-  assert.typeof(getKref, 'function');
-  return getKref();
-};
-
-const kmarshal = makeMarshal(krefOf, kslot, {
-  serializeBodyFormat: 'smallcaps',
-  errorTagging: 'off',
-});
-
-export const kser = value => kmarshal.serialize(harden(value));
-
-export const kunser = serializedValue => kmarshal.unserialize(serializedValue);
-
-export function makeError(message) {
-  assert.typeof(message, 'string');
-  return kser(Error(message));
-}

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}`);
-  }
-});