refactor(swingset-vat): replace storeModule with VatData export

Agoric · Feb 18, 2022 · 99131c7 · 99131c7
1 parent 7c6e3a7
commit 99131c7
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 28 deletions.
diff --git a/packages/SwingSet/src/storeModule.js b/packages/SwingSet/src/storeModule.js
diff --git a/packages/SwingSet/test/virtualObjects/vat-representative-bootstrap.js b/packages/SwingSet/test/virtualObjects/vat-representative-bootstrap.js
@@ -1,5 +1,8 @@
 import { Far } from '@endo/marshal';
-import { makeKind, makeScalarBigWeakMapStore } from '../../src/storeModule.js';
+
+import { VatData } from '../../src/index.js';
+
+const { makeKind, makeScalarBigWeakMapStore } = VatData;
 
 let stuff;
 

diff --git a/packages/SwingSet/test/virtualObjects/vat-vom-gc-bob.js b/packages/SwingSet/test/virtualObjects/vat-vom-gc-bob.js
@@ -1,6 +1,9 @@
 import { E } from '@agoric/eventual-send';
 import { Far } from '@endo/marshal';
-import { makeKind } from '../../src/storeModule.js';
+
+import { VatData } from '../../src/index.js';
+
+const { makeKind } = VatData;
 
 const things = [];
 

diff --git a/packages/SwingSet/test/virtualObjects/vat-weakcollections-alice.js b/packages/SwingSet/test/virtualObjects/vat-weakcollections-alice.js
@@ -1,5 +1,8 @@
 import { Far } from '@endo/marshal';
-import { makeKind } from '../../src/storeModule.js';
+
+import { VatData } from '../../src/index.js';
+
+const { makeKind } = VatData;
 
 function makeHolderInnards(state) {
   function init(value) {

diff --git a/packages/swingset-runner/demo/vatStore1/vat-bob.js b/packages/swingset-runner/demo/vatStore1/vat-bob.js
@@ -1,5 +1,7 @@
 import { Far } from '@endo/marshal';
-import { makeKind } from '@agoric/swingset-vat/src/storeModule.js';
+import { VatData } from '@agoric/swingset-vat';
+
+const { makeKind } = VatData;
 
 const p = console.log;
 

diff --git a/packages/swingset-runner/demo/vatStore2/thingHolder.js b/packages/swingset-runner/demo/vatStore2/thingHolder.js
@@ -1,9 +1,8 @@
 import { E } from '@agoric/eventual-send';
 import { Far } from '@endo/marshal';
-import {
-  makeKind,
-  makeScalarBigWeakMapStore,
-} from '@agoric/swingset-vat/src/storeModule.js';
+import { VatData } from '@agoric/swingset-vat';
+
+const { makeKind, makeScalarBigWeakMapStore } = VatData;
 
 const p = console.log;
 

diff --git a/packages/swingset-runner/demo/vatStore3/vat-bob.js b/packages/swingset-runner/demo/vatStore3/vat-bob.js
@@ -1,6 +1,8 @@
 import { E } from '@agoric/eventual-send';
 import { Far } from '@endo/marshal';
-import { makeKind } from '@agoric/swingset-vat/src/storeModule.js';
+import { VatData } from '@agoric/swingset-vat';
+
+const { makeKind } = VatData;
 
 const things = [];
 

diff --git a/packages/swingset-runner/demo/virtualObjectGC/vat-bob.js b/packages/swingset-runner/demo/virtualObjectGC/vat-bob.js
@@ -1,6 +1,9 @@
 import { E } from '@agoric/eventual-send';
 import { Far } from '@endo/marshal';
-import { makeKind } from '@agoric/swingset-vat/src/storeModule.js';
+
+import { VatData } from '@agoric/swingset-vat';
+
+const { makeKind } = VatData;
 
 export function buildRootObject(_vatPowers) {
   function makeThingInnards(state) {

diff --git a/packages/zoe/test/minimalMakeKindContract.js b/packages/zoe/test/minimalMakeKindContract.js
@@ -1,3 +1,4 @@
+// NB: cannot import, breaks bundle building
 /* global VatData */
 
 const start = _zcf => {