@agoric/swingset-vat 0.32.3-dev-8358d20.0 → 0.32.3-dev-5eb596e.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-8358d20.0+8358d20",
+  "version": "0.32.3-dev-5eb596e.0+5eb596e",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,16 +27,16 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-8358d20.0+8358d20",
-    "@agoric/internal": "0.3.3-dev-8358d20.0+8358d20",
-    "@agoric/store": "0.9.3-dev-8358d20.0+8358d20",
-    "@agoric/swing-store": "0.9.2-dev-8358d20.0+8358d20",
-    "@agoric/swingset-liveslots": "0.10.3-dev-8358d20.0+8358d20",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-8358d20.0+8358d20",
-    "@agoric/time": "0.3.3-dev-8358d20.0+8358d20",
-    "@agoric/vat-data": "0.5.3-dev-8358d20.0+8358d20",
-    "@agoric/xsnap": "0.14.3-dev-8358d20.0+8358d20",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-8358d20.0+8358d20",
+    "@agoric/assert": "0.6.1-dev-5eb596e.0+5eb596e",
+    "@agoric/internal": "0.3.3-dev-5eb596e.0+5eb596e",
+    "@agoric/store": "0.9.3-dev-5eb596e.0+5eb596e",
+    "@agoric/swing-store": "0.9.2-dev-5eb596e.0+5eb596e",
+    "@agoric/swingset-liveslots": "0.10.3-dev-5eb596e.0+5eb596e",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-5eb596e.0+5eb596e",
+    "@agoric/time": "0.3.3-dev-5eb596e.0+5eb596e",
+    "@agoric/vat-data": "0.5.3-dev-5eb596e.0+5eb596e",
+    "@agoric/xsnap": "0.14.3-dev-5eb596e.0+5eb596e",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-5eb596e.0+5eb596e",
     "@endo/base64": "^0.2.32",
     "@endo/bundle-source": "^2.5.2",
     "@endo/captp": "^3.1.2",
@@ -93,5 +93,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8358d208a105af24bc267ba4ef928ca7ecf6a4e3"
+  "gitHead": "5eb596e63bf4d5b416d4eff187e87af366b34928"
 }

package/tools/prepare-test-env.js

@@ -1,4 +1,3 @@
-/* global globalThis */
 /**
  * Prepare Agoric SwingSet vat global environment for testing.
  *
@@ -6,44 +5,10 @@
  * and stores.
  */
 
-import '@endo/init/pre-bundle-source.js';
+import '@endo/init/pre.js';
 
 import './install-ses-debug.js';
-import { makeFakeVirtualStuff } from '@agoric/swingset-liveslots/tools/fakeVirtualSupport.js';
+import { reincarnate } from './setup-vat-data.js';
 
-const { vom, cm, wpm } = makeFakeVirtualStuff();
-
-const {
-  defineKind,
-  defineKindMulti,
-  defineDurableKind,
-  defineDurableKindMulti,
-  makeKindHandle,
-  canBeDurable,
-} = vom;
-
-const {
-  makeScalarBigMapStore,
-  makeScalarBigWeakMapStore,
-  makeScalarBigSetStore,
-  makeScalarBigWeakSetStore,
-} = cm;
-
-const { watchPromise, providePromiseWatcher } = wpm;
-
-const VatData = harden({
-  defineKind,
-  defineKindMulti,
-  defineDurableKind,
-  defineDurableKindMulti,
-  makeKindHandle,
-  providePromiseWatcher,
-  watchPromise,
-  makeScalarBigMapStore,
-  makeScalarBigWeakMapStore,
-  makeScalarBigSetStore,
-  makeScalarBigWeakSetStore,
-  canBeDurable,
-});
-
-globalThis.VatData = VatData;
+// Install the VatData globals.
+reincarnate();

package/tools/setup-vat-data.js

@@ -0,0 +1,54 @@
+// @ts-check
+/* global globalThis */
+// This file produces the globalThis.VatData property outside of a running
+// SwingSet so that it can be used by '@agoric/vat-data' (which only *consumes*
+// `globalThis.VatData`) in code under test.
+import { makeFakeVirtualStuff } from '@agoric/swingset-liveslots/tools/fakeVirtualSupport.js';
+
+const { WeakMap, WeakSet } = globalThis;
+
+/** @type {ReturnType<makeFakeVirtualStuff>} */
+let fakeVomKit;
+
+globalThis.VatData = harden({
+  defineKind: (...args) => fakeVomKit.vom.defineKind(...args),
+  defineKindMulti: (...args) => fakeVomKit.vom.defineKindMulti(...args),
+  defineDurableKind: (...args) => fakeVomKit.vom.defineDurableKind(...args),
+  defineDurableKindMulti: (...args) =>
+    fakeVomKit.vom.defineDurableKindMulti(...args),
+  makeKindHandle: (...args) => fakeVomKit.vom.makeKindHandle(...args),
+  canBeDurable: (...args) => fakeVomKit.vom.canBeDurable(...args),
+  providePromiseWatcher: (...args) =>
+    fakeVomKit.wpm.providePromiseWatcher(...args),
+  watchPromise: (...args) => fakeVomKit.wpm.watchPromise(...args),
+  makeScalarBigMapStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigMapStore(...args),
+  makeScalarBigWeakMapStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigWeakMapStore(...args),
+  makeScalarBigSetStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigSetStore(...args),
+  makeScalarBigWeakSetStore: (...args) =>
+    fakeVomKit.cm.makeScalarBigWeakSetStore(...args),
+});
+
+export const reincarnate = (options = {}) => {
+  const { fakeStore = new Map(), fakeVomKit: fvk } = options;
+
+  if (options.fakeVomKit) {
+    fvk.vom.flushStateCache();
+    fvk.cm.flushSchemaCache();
+    fvk.vrm.flushIDCounters();
+  }
+
+  fakeVomKit = makeFakeVirtualStuff({
+    ...options,
+    fakeStore,
+    WeakMap,
+    WeakSet,
+  });
+
+  globalThis.WeakMap = fakeVomKit.vom.VirtualObjectAwareWeakMap;
+  globalThis.WeakSet = fakeVomKit.vom.VirtualObjectAwareWeakSet;
+
+  return { ...options, fakeStore, fakeVomKit };
+};