@agoric/swing-store 0.9.2-dev-c6d8a27.0 → 0.9.2-dev-479a1a0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swing-store",
-  "version": "0.9.2-dev-c6d8a27.0+c6d8a27",
+  "version": "0.9.2-dev-479a1a0.0+479a1a0",
   "description": "Persistent storage for SwingSet",
   "type": "module",
   "main": "./src/index.js",
@@ -21,8 +21,8 @@
     "lint:eslint": "eslint ."
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-c6d8a27.0+c6d8a27",
-    "@agoric/internal": "0.3.3-dev-c6d8a27.0+c6d8a27",
+    "@agoric/assert": "0.6.1-dev-479a1a0.0+479a1a0",
+    "@agoric/internal": "0.3.3-dev-479a1a0.0+479a1a0",
     "@endo/base64": "^0.2.32",
     "@endo/bundle-source": "^2.5.2",
     "@endo/check-bundle": "^0.2.19",
@@ -45,5 +45,5 @@
     ],
     "timeout": "2m"
   },
-  "gitHead": "c6d8a278ad7d7c0ad758f57c7e4db858d6a67e53"
+  "gitHead": "479a1a02a362144acf30cb9ca956dc05f6cfb5ea"
 }

package/test/exports.js

@@ -0,0 +1,99 @@
+import { Buffer } from 'buffer';
+import { makeB0ID } from './util.js';
+
+export const snapshotData = 'snapshot data';
+// this snapHash was computed manually
+export const snapHash =
+  'e7dee7266896538616b630a5da40a90e007726a383e005a9c9c5dd0c2daf9329';
+
+/** @type {import('../src/bundleStore.js').Bundle} */
+export const bundle0 = { moduleFormat: 'nestedEvaluate', source: '1+1' };
+export const bundle0ID = makeB0ID(bundle0);
+
+export function buildData() {
+  // build an export manually
+  const exportData = new Map();
+  const artifacts = new Map();
+
+  // shadow kvStore
+  exportData.set('kv.key1', 'value1');
+
+  // now add artifacts and metadata in pairs
+
+  artifacts.set(`bundle.${bundle0ID}`, JSON.stringify(bundle0));
+  exportData.set(`bundle.${bundle0ID}`, bundle0ID);
+
+  const sbase = { vatID: 'v1', hash: snapHash, inUse: 0 };
+  const tbase = { vatID: 'v1', startPos: 0, isCurrent: 0, incarnation: 1 };
+  const addTS = (key, obj) =>
+    exportData.set(key, JSON.stringify({ ...tbase, ...obj }));
+  const t0hash =
+    '5bee0f44eca02f23eab03703e84ed2647d5d117fed99e1c30a3b424b7f082ab9';
+  const t2hash =
+    '57152efdd7fdf75c03371d2b4f1088d5bf3eae7fe643babce527ff81df38998c';
+  const t5hash =
+    '1947001e78e01bd1e773feb22b4ffc530447373b9de9274d5d5fbda3f23dbf2b';
+  const t8hash =
+    'e6b42c6a3fb94285a93162f25a9fc0145fd4c5bb144917dc572c50ae2d02ee69';
+
+  addTS(`transcript.v1.0`, { incarnation: 0, endPos: 2, hash: t0hash });
+  artifacts.set(`transcript.v1.0.2`, 'start-worker\nshutdown-worker\n');
+
+  addTS(`transcript.v1.2`, { startPos: 2, endPos: 5, hash: t2hash });
+  artifacts.set(
+    `transcript.v1.2.5`,
+    'start-worker\ndelivery1\nsave-snapshot\n',
+  );
+  exportData.set(`snapshot.v1.4`, JSON.stringify({ ...sbase, snapPos: 4 }));
+  artifacts.set(`snapshot.v1.4`, snapshotData);
+
+  addTS(`transcript.v1.5`, { startPos: 5, endPos: 8, hash: t5hash });
+  artifacts.set(
+    'transcript.v1.5.8',
+    'load-snapshot\ndelivery2\nsave-snapshot\n',
+  );
+  exportData.set(
+    `snapshot.v1.7`,
+    JSON.stringify({ ...sbase, snapPos: 7, inUse: 1 }),
+  );
+  artifacts.set(`snapshot.v1.7`, snapshotData);
+
+  artifacts.set('transcript.v1.8.10', 'load-snapshot\ndelivery3\n');
+  exportData.set(`snapshot.v1.current`, 'snapshot.v1.7');
+  addTS(`transcript.v1.current`, {
+    startPos: 8,
+    endPos: 10,
+    isCurrent: 1,
+    hash: t8hash,
+  });
+
+  return { exportData, artifacts, t0hash, t2hash, t5hash, t8hash };
+}
+
+/**
+ * @param { Map<string, string | null> } exportData
+ * @param { Map<string, string> } artifacts
+ */
+export function makeExporter(exportData, artifacts) {
+  return {
+    async *getExportData() {
+      for (const [key, value] of exportData.entries()) {
+        /** @type { import('../src/exporter.js').KVPair } */
+        const pair = [key, value];
+        yield pair;
+      }
+    },
+    async *getArtifactNames() {
+      for (const name of artifacts.keys()) {
+        yield name;
+      }
+    },
+    async *getArtifact(name) {
+      const data = artifacts.get(name);
+      assert(data, `missing artifact ${name}`);
+      yield Buffer.from(data);
+    },
+    // eslint-disable-next-line no-empty-function
+    async close() {},
+  };
+}

package/test/test-import.js

@@ -14,7 +14,15 @@ import { decodeBase64 } from '@endo/base64';
 import { buffer } from '../src/util.js';
 import { importSwingStore, makeSwingStoreExporter } from '../src/index.js';
 
-import { tmpDir, makeB0ID } from './util.js';
+import { tmpDir } from './util.js';
+import {
+  buildData,
+  bundle0,
+  bundle0ID,
+  makeExporter,
+  snapHash,
+  snapshotData,
+} from './exports.js';
 
 const rank = {
   operational: 1,
@@ -23,15 +31,6 @@ const rank = {
   debug: 4,
 };
 
-const snapshotData = 'snapshot data';
-// this snapHash was computed manually
-const snapHash =
-  'e7dee7266896538616b630a5da40a90e007726a383e005a9c9c5dd0c2daf9329';
-
-/** @type {import('../src/bundleStore.js').Bundle} */
-const bundle0 = { moduleFormat: 'nestedEvaluate', source: '1+1' };
-const bundle0ID = makeB0ID(bundle0);
-
 function convert(orig) {
   const bundles = Object.fromEntries(
     Object.entries(orig.bundles).map(([bundleID, encBundle]) => {
@@ -44,38 +43,6 @@ function convert(orig) {
   return { ...orig, bundles };
 }
 
-/**
- * @typedef { import('../src/exporter').KVPair } KVPair
- */
-
-/**
- * @param { Map<string, string | null> } exportData
- * @param { Map<string, string> } artifacts
- */
-export function makeExporter(exportData, artifacts) {
-  return {
-    async *getExportData() {
-      for (const [key, value] of exportData.entries()) {
-        /** @type { KVPair } */
-        const pair = [key, value];
-        yield pair;
-      }
-    },
-    async *getArtifactNames() {
-      for (const name of artifacts.keys()) {
-        yield name;
-      }
-    },
-    async *getArtifact(name) {
-      const data = artifacts.get(name);
-      assert(data, `missing artifact ${name}`);
-      yield Buffer.from(data);
-    },
-    // eslint-disable-next-line no-empty-function
-    async close() {},
-  };
-}
-
 test('import empty', async t => {
   const [dbDir, cleanup] = await tmpDir('testdb');
   t.teardown(cleanup);
@@ -91,66 +58,6 @@ test('import empty', async t => {
   });
 });
 
-export function buildData() {
-  // build an export manually
-  const exportData = new Map();
-  const artifacts = new Map();
-
-  // shadow kvStore
-  exportData.set('kv.key1', 'value1');
-
-  // now add artifacts and metadata in pairs
-
-  artifacts.set(`bundle.${bundle0ID}`, JSON.stringify(bundle0));
-  exportData.set(`bundle.${bundle0ID}`, bundle0ID);
-
-  const sbase = { vatID: 'v1', hash: snapHash, inUse: 0 };
-  const tbase = { vatID: 'v1', startPos: 0, isCurrent: 0, incarnation: 1 };
-  const addTS = (key, obj) =>
-    exportData.set(key, JSON.stringify({ ...tbase, ...obj }));
-  const t0hash =
-    '5bee0f44eca02f23eab03703e84ed2647d5d117fed99e1c30a3b424b7f082ab9';
-  const t2hash =
-    '57152efdd7fdf75c03371d2b4f1088d5bf3eae7fe643babce527ff81df38998c';
-  const t5hash =
-    '1947001e78e01bd1e773feb22b4ffc530447373b9de9274d5d5fbda3f23dbf2b';
-  const t8hash =
-    'e6b42c6a3fb94285a93162f25a9fc0145fd4c5bb144917dc572c50ae2d02ee69';
-
-  addTS(`transcript.v1.0`, { incarnation: 0, endPos: 2, hash: t0hash });
-  artifacts.set(`transcript.v1.0.2`, 'start-worker\nshutdown-worker\n');
-
-  addTS(`transcript.v1.2`, { startPos: 2, endPos: 5, hash: t2hash });
-  artifacts.set(
-    `transcript.v1.2.5`,
-    'start-worker\ndelivery1\nsave-snapshot\n',
-  );
-  exportData.set(`snapshot.v1.4`, JSON.stringify({ ...sbase, snapPos: 4 }));
-  artifacts.set(`snapshot.v1.4`, snapshotData);
-
-  addTS(`transcript.v1.5`, { startPos: 5, endPos: 8, hash: t5hash });
-  artifacts.set(
-    'transcript.v1.5.8',
-    'load-snapshot\ndelivery2\nsave-snapshot\n',
-  );
-  exportData.set(
-    `snapshot.v1.7`,
-    JSON.stringify({ ...sbase, snapPos: 7, inUse: 1 }),
-  );
-  artifacts.set(`snapshot.v1.7`, snapshotData);
-
-  artifacts.set('transcript.v1.8.10', 'load-snapshot\ndelivery3\n');
-  exportData.set(`snapshot.v1.current`, 'snapshot.v1.7');
-  addTS(`transcript.v1.current`, {
-    startPos: 8,
-    endPos: 10,
-    isCurrent: 1,
-    hash: t8hash,
-  });
-
-  return { exportData, artifacts, t0hash, t2hash, t5hash, t8hash };
-}
-
 const importTest = test.macro(async (t, mode) => {
   /** @typedef {import('../src/internal.js').ArtifactMode} ArtifactMode */
   const artifactMode = /** @type {ArtifactMode} */ (mode);

package/test/test-repair-metadata.js

@@ -8,7 +8,7 @@ import sqlite3 from 'better-sqlite3';
 
 import { importSwingStore } from '../src/index.js';
 
-import { makeExporter, buildData } from './test-import.js';
+import { makeExporter, buildData } from './exports.js';
 import { tmpDir } from './util.js';
 
 test('repair metadata', async t => {