feat: move liveslots and specific tests to a new package

This creates a new `@agoric/swingset-liveslots` package, which owns the old `packages/SwingSet/src/liveslots/` code. Several tests which specifically exercised liveslots (but not the rest of the kernel) were moved over, along with some helper files. The "fake virtual stuff" tools in SwingSet/tools/ were moved over too. No file contents were changed, so the new files won't work yet (and this breaks SwingSet itself), until we modify them in the next commit. This "move, then modify" approach should help with git rebasing and history management in the future, as well as code review. New files were created for the metadata: package.json, jsconfig.json. The agoric-cli `sdk-package-names.js` file was regenerated to include the new package. refs #6596
Agoric · Jan 27, 2023 · 1216b2b · 1216b2b
1 parent 1e47de0
commit 1216b2b
Show file tree

Hide file tree

Showing 36 changed files with 80 additions and 0 deletions.
diff --git a/packages/agoric-cli/src/sdk-package-names.js b/packages/agoric-cli/src/sdk-package-names.js
@@ -28,6 +28,7 @@ export default [
   "@agoric/stat-logger",
   "@agoric/store",
   "@agoric/swing-store",
+  "@agoric/swingset-liveslots",
   "@agoric/swingset-runner",
   "@agoric/swingset-vat",
   "@agoric/telemetry",

diff --git a/packages/swingset-liveslots/jsconfig.json b/packages/swingset-liveslots/jsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "noEmit": true,
+    "downlevelIteration": true,
+    "strictNullChecks": true,
+    "noImplicitThis": true,
+    "moduleResolution": "node",
+  },
+  "include": [
+    "*.js",
+    "scripts/**/*.js",
+    "src/**/*.js",
+    "test/**/*.js",
+    "tools/**/*.js",
+  ],
+}
diff --git a/packages/swingset-liveslots/package.json b/packages/swingset-liveslots/package.json
@@ -0,0 +1,60 @@
+{
+  "name": "@agoric/swingset-liveslots",
+  "version": "0.9.0",
+  "description": "SwingSet ocap support layer",
+  "type": "module",
+  "main": "src/index.js",
+  "engines": {
+    "node": ">=14.15.0"
+  },
+  "scripts": {
+    "build": "exit 0",
+    "test": "ava",
+    "test:xs": "exit 0",
+    "lint-fix": "yarn lint:eslint --fix",
+    "lint": "yarn lint:types&&yarn lint:eslint",
+    "lint:types": "tsc -p jsconfig.json",
+    "lint:eslint": "eslint ."
+  },
+  "devDependencies": {},
+  "dependencies": {
+    "@agoric/assert": "^0.5.1",
+    "@agoric/internal": "^0.2.1",
+    "@agoric/nat": "^4.1.0",
+    "@agoric/store": "^0.8.3",
+    "@agoric/vat-data": "^0.4.3",
+    "@endo/eventual-send": "^0.16.8",
+    "@endo/init": "^0.5.52",
+    "@endo/marshal": "^0.8.1",
+    "@endo/promise-kit": "^0.2.52"
+  },
+  "peerDependencies": {
+    "@endo/ses-ava": "^0.2.36",
+    "ava": "^5.1.0"
+  },
+  "files": [
+    "src/**/*.js",
+    "src/**/*.d.ts",
+    "exported.js"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Agoric/agoric-sdk.git"
+  },
+  "author": "Agoric",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/Agoric/agoric-sdk/issues"
+  },
+  "homepage": "https://github.com/Agoric/agoric-sdk#readme",
+  "ava": {
+    "files": [
+      "test/**/test-*.js"
+    ],
+    "timeout": "20m",
+    "workerThreads": false
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}
diff --git a/...ingSet/src/liveslots/collectionManager.js → ...ingset-liveslots/src/collectionManager.js b/...ingSet/src/liveslots/collectionManager.js → ...ingset-liveslots/src/collectionManager.js
diff --git a/packages/swingset-liveslots/src/index.js b/packages/swingset-liveslots/src/index.js
@@ -0,0 +1 @@
+export { makeLiveSlots, makeMarshaller } from './liveslots.js';
diff --git a/packages/SwingSet/src/liveslots/liveslots.js → packages/swingset-liveslots/src/liveslots.js b/packages/SwingSet/src/liveslots/liveslots.js → packages/swingset-liveslots/src/liveslots.js
diff --git a/packages/SwingSet/src/liveslots/stop-vat.js → packages/swingset-liveslots/src/stop-vat.js b/packages/SwingSet/src/liveslots/stop-vat.js → packages/swingset-liveslots/src/stop-vat.js
diff --git a/...ngSet/src/liveslots/vatstore-iterators.js → ...ngset-liveslots/src/vatstore-iterators.js b/...ngSet/src/liveslots/vatstore-iterators.js → ...ngset-liveslots/src/vatstore-iterators.js
diff --git a/.../SwingSet/src/liveslots/vatstore-usage.md → .../swingset-liveslots/src/vatstore-usage.md b/.../SwingSet/src/liveslots/vatstore-usage.md → .../swingset-liveslots/src/vatstore-usage.md
diff --git a/...Set/src/liveslots/virtualObjectManager.js → ...set-liveslots/src/virtualObjectManager.js b/...Set/src/liveslots/virtualObjectManager.js → ...set-liveslots/src/virtualObjectManager.js
diff --git a/...ingSet/src/liveslots/virtualReferences.js → ...ingset-liveslots/src/virtualReferences.js b/...ingSet/src/liveslots/virtualReferences.js → ...ingset-liveslots/src/virtualReferences.js
diff --git a/...s/SwingSet/src/liveslots/vpid-tracking.md → ...s/swingset-liveslots/src/vpid-tracking.md b/...s/SwingSet/src/liveslots/vpid-tracking.md → ...s/swingset-liveslots/src/vpid-tracking.md
diff --git a/...SwingSet/src/liveslots/watchedPromises.js → ...swingset-liveslots/src/watchedPromises.js b/...SwingSet/src/liveslots/watchedPromises.js → ...swingset-liveslots/src/watchedPromises.js
diff --git a/packages/SwingSet/test/gc-helpers.js → ...ges/swingset-liveslots/test/gc-helpers.js b/packages/SwingSet/test/gc-helpers.js → ...ges/swingset-liveslots/test/gc-helpers.js
diff --git a/packages/SwingSet/test/liveslots-helpers.js → ...ngset-liveslots/test/liveslots-helpers.js b/packages/SwingSet/test/liveslots-helpers.js → ...ngset-liveslots/test/liveslots-helpers.js
diff --git a/...est/stores/test-storeGC/test-lifecycle.js → ...-liveslots/test/storeGC/test-lifecycle.js b/...est/stores/test-storeGC/test-lifecycle.js → ...-liveslots/test/storeGC/test-lifecycle.js
diff --git a/.../test-storeGC/test-refcount-management.js → .../test/storeGC/test-refcount-management.js b/.../test-storeGC/test-refcount-management.js → .../test/storeGC/test-refcount-management.js
diff --git a/...es/test-storeGC/test-scalar-store-kind.js → ...ts/test/storeGC/test-scalar-store-kind.js b/...es/test-storeGC/test-scalar-store-kind.js → ...ts/test/storeGC/test-scalar-store-kind.js
diff --git a/...test/stores/test-storeGC/test-weak-key.js → ...t-liveslots/test/storeGC/test-weak-key.js b/...test/stores/test-storeGC/test-weak-key.js → ...t-liveslots/test/storeGC/test-weak-key.js
diff --git a/packages/SwingSet/test/test-baggage.js → ...s/swingset-liveslots/test/test-baggage.js b/packages/SwingSet/test/test-baggage.js → ...s/swingset-liveslots/test/test-baggage.js
diff --git a/.../SwingSet/test/stores/test-collections.js → ...ingset-liveslots/test/test-collections.js b/.../SwingSet/test/stores/test-collections.js → ...ingset-liveslots/test/test-collections.js
diff --git a/...gSet/test/stores/test-durabilityChecks.js → ...t-liveslots/test/test-durabilityChecks.js b/...gSet/test/stores/test-durabilityChecks.js → ...t-liveslots/test/test-durabilityChecks.js
diff --git a/packages/SwingSet/test/test-liveslots.js → ...swingset-liveslots/test/test-liveslots.js b/packages/SwingSet/test/test-liveslots.js → ...swingset-liveslots/test/test-liveslots.js
diff --git a/...t/vo-test-harness/test-vo-test-harness.js → ...et-liveslots/test/test-vo-test-harness.js b/...t/vo-test-harness/test-vo-test-harness.js → ...et-liveslots/test/test-vo-test-harness.js
diff --git a/...ages/SwingSet/test/test-vpid-liveslots.js → ...set-liveslots/test/test-vpid-liveslots.js b/...ages/SwingSet/test/test-vpid-liveslots.js → ...set-liveslots/test/test-vpid-liveslots.js
diff --git a/.../virtualObjects/test-cease-recognition.js → ...virtual-objects/test-cease-recognition.js b/.../virtualObjects/test-cease-recognition.js → ...virtual-objects/test-cease-recognition.js
diff --git a/...st/virtualObjects/test-reachable-vrefs.js → ...t/virtual-objects/test-reachable-vrefs.js b/...st/virtualObjects/test-reachable-vrefs.js → ...t/virtual-objects/test-reachable-vrefs.js
diff --git a/...t/virtualObjects/test-retain-remotable.js → .../virtual-objects/test-retain-remotable.js b/...t/virtualObjects/test-retain-remotable.js → .../virtual-objects/test-retain-remotable.js
diff --git a/...virtualObjects/test-virtualObjectCache.js → ...irtual-objects/test-virtualObjectCache.js b/...virtualObjects/test-virtualObjectCache.js → ...irtual-objects/test-virtualObjectCache.js
diff --git a/...st/virtualObjects/test-virtualObjectGC.js → ...t/virtual-objects/test-virtualObjectGC.js b/...st/virtualObjects/test-virtualObjectGC.js → ...t/virtual-objects/test-virtualObjectGC.js
diff --git a/...rtualObjects/test-virtualObjectManager.js → ...tual-objects/test-virtualObjectManager.js b/...rtualObjects/test-virtualObjectManager.js → ...tual-objects/test-virtualObjectManager.js
diff --git a/...cts/test-weakcollections-vref-handling.js → ...cts/test-weakcollections-vref-handling.js b/...cts/test-weakcollections-vref-handling.js → ...cts/test-weakcollections-vref-handling.js
diff --git a/...s/SwingSet/tools/fakeCollectionManager.js → ...-liveslots/tools/fakeCollectionManager.js b/...s/SwingSet/tools/fakeCollectionManager.js → ...-liveslots/tools/fakeCollectionManager.js
diff --git a/...wingSet/tools/fakeVirtualObjectManager.js → ...veslots/tools/fakeVirtualObjectManager.js b/...wingSet/tools/fakeVirtualObjectManager.js → ...veslots/tools/fakeVirtualObjectManager.js
diff --git a/...ages/SwingSet/tools/fakeVirtualSupport.js → ...set-liveslots/tools/fakeVirtualSupport.js b/...ages/SwingSet/tools/fakeVirtualSupport.js → ...set-liveslots/tools/fakeVirtualSupport.js
diff --git a/packages/SwingSet/tools/vo-test-harness.js → ...ingset-liveslots/tools/vo-test-harness.js b/packages/SwingSet/tools/vo-test-harness.js → ...ingset-liveslots/tools/vo-test-harness.js