From 99131c752d2a007d7ae83fdbe6a4558d2d81c749 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Fri, 18 Feb 2022 11:41:02 -0800 Subject: [PATCH] refactor(swingset-vat): replace storeModule with VatData export --- packages/SwingSet/src/storeModule.js | 18 ------------------ .../vat-representative-bootstrap.js | 5 ++++- .../test/virtualObjects/vat-vom-gc-bob.js | 5 ++++- .../vat-weakcollections-alice.js | 5 ++++- .../swingset-runner/demo/vatStore1/vat-bob.js | 4 +++- .../demo/vatStore2/thingHolder.js | 7 +++---- .../swingset-runner/demo/vatStore3/vat-bob.js | 4 +++- .../demo/virtualObjectGC/vat-bob.js | 5 ++++- packages/zoe/test/minimalMakeKindContract.js | 1 + 9 files changed, 26 insertions(+), 28 deletions(-) delete mode 100644 packages/SwingSet/src/storeModule.js diff --git a/packages/SwingSet/src/storeModule.js b/packages/SwingSet/src/storeModule.js deleted file mode 100644 index 56f5fa901ae..00000000000 --- a/packages/SwingSet/src/storeModule.js +++ /dev/null @@ -1,18 +0,0 @@ -/* global VatData */ - -export const { - makeKind, - makeDurableKind, - makeScalarBigMapStore, - makeScalarBigWeakMapStore, - makeScalarBigSetStore, - makeScalarBigWeakSetStore, -} = VatData; - -export { - M, - makeScalarMapStore, - makeScalarWeakMapStore, - makeScalarSetStore, - makeScalarWeakSetStore, -} from '@agoric/store'; diff --git a/packages/SwingSet/test/virtualObjects/vat-representative-bootstrap.js b/packages/SwingSet/test/virtualObjects/vat-representative-bootstrap.js index e8d645f1e90..39b6d046f01 100644 --- 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 index 525afb135c1..b70c08c1737 100644 --- 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 index 647c2617401..ddb0479683f 100644 --- 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 index 661b9a61c42..185cf1154d1 100644 --- 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 index 455bc401879..026a998967f 100644 --- 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 index d2b42095261..d7cd87286dc 100644 --- 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 index f1b5f10a9c4..d468b2f57ce 100644 --- 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 index 96fccef580d..73fd08d6dd8 100644 --- 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 => {