@agoric/swing-store 0.9.2-dev-141be47.0 → 0.9.2-dev-0e6a9f4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swing-store",
-  "version": "0.9.2-dev-141be47.0+141be47",
+  "version": "0.9.2-dev-0e6a9f4.0+0e6a9f4",
   "description": "Persistent storage for SwingSet",
   "type": "module",
   "main": "./src/index.js",
@@ -21,7 +21,7 @@
     "lint:eslint": "eslint ."
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-141be47.0+141be47",
+    "@agoric/internal": "0.3.3-dev-0e6a9f4.0+0e6a9f4",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^3.5.1",
     "@endo/check-bundle": "^1.0.13",
@@ -51,5 +51,5 @@
   "typeCoverage": {
     "atLeast": 79.43
   },
-  "gitHead": "141be4797701dccc8c47c4b3d8f452ea21590c4f"
+  "gitHead": "0e6a9f409040c4805179f0f8adee40cd1bd22ae2"
 }

package/test/bundles.test.js

@@ -1,13 +1,16 @@
 // @ts-check
 import test from 'ava';
-import tmp from 'tmp';
 import { Buffer } from 'buffer';
+import tmp from 'tmp';
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
 import { createSHA256 } from '../src/hasher.js';
 import { initSwingStore } from '../src/swingStore.js';
 import { makeSwingStoreExporter } from '../src/exporter.js';
 import { importSwingStore } from '../src/importer.js';
 import { buffer } from '../src/util.js';
 
+const tmpDir = makeTempDirFactory(tmp);
+
 function makeB0ID(bundle) {
   return `b0-${createSHA256(JSON.stringify(bundle)).finish()}`;
 }
@@ -53,17 +56,6 @@ function makeExportCallback() {
   };
 }
 
-const tmpDir = prefix =>
-  new Promise((resolve, reject) => {
-    tmp.dir({ unsafeCleanup: true, prefix }, (err, name, removeCallback) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve([name, removeCallback]);
-      }
-    });
-  });
-
 const collectArray = async iter => {
   const items = [];
   for await (const item of iter) {
@@ -73,7 +65,7 @@ const collectArray = async iter => {
 };
 
 test('b0 export', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const { exportData, exportCallback } = makeExportCallback();
   const { kernelStorage, hostStorage } = initSwingStore(dbDir, {

package/test/deletion.test.js

@@ -7,13 +7,15 @@ import fs from 'node:fs';
 import zlib from 'node:zlib';
 import sqlite3 from 'better-sqlite3';
 import tmp from 'tmp';
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
 import { arrayIsLike } from '@agoric/internal/tools/ava-assertions.js';
-import { tmpDir } from './util.js';
 import { initSwingStore } from '../src/swingStore.js';
 import { makeArchiveSnapshot, makeArchiveTranscript } from '../src/archiver.js';
 import { makeSwingStoreExporter } from '../src/exporter.js';
 import { importSwingStore } from '../src/importer.js';
 
+const tmpDir = makeTempDirFactory(tmp);
+
 async function* getSnapshotStream() {
   yield Buffer.from('abc');
 }
@@ -139,7 +141,7 @@ const getExport = async (dbDir, artifactMode) => {
 };
 
 const reImport = async (t, dbDir, artifactMode) => {
-  const [dbDir2, cleanup] = await tmpDir('testdb2');
+  const [dbDir2, cleanup] = tmpDir('testdb2');
   t.teardown(cleanup);
   const exporter = makeSwingStoreExporter(dbDir, { artifactMode });
   const ss2 = await importSwingStore(exporter, dbDir2, { artifactMode });
@@ -170,9 +172,9 @@ const setupTranscript = async (t, keepTranscripts) => {
     }
     mergeExportDeltas(currentExportData, exports);
   };
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
-  const [archiveDir, cleanupArchives] = await tmpDir('archives');
+  const [archiveDir, cleanupArchives] = tmpDir('archives');
   t.teardown(cleanupArchives);
   const fsPowers = { fs, path, tmp };
   const archiveSnapshot = makeArchiveSnapshot(archiveDir, fsPowers);
@@ -531,7 +533,7 @@ const setupSnapshots = async t => {
     }
     mergeExportDeltas(currentExportData, exports);
   };
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const store = initSwingStore(dbDir, { exportCallback });
   const { kernelStorage, hostStorage } = store;

package/test/export.test.js

@@ -1,9 +1,14 @@
 import test from 'ava';
+import tmp from 'tmp';
+
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
 
 import { buffer } from '../src/util.js';
 import { initSwingStore, makeSwingStoreExporter } from '../src/index.js';
 
-import { tmpDir, getSnapshotStream, makeB0ID } from './util.js';
+import { getSnapshotStream, makeB0ID } from './util.js';
+
+const tmpDir = makeTempDirFactory(tmp);
 
 const rank = {
   operational: 1,
@@ -23,7 +28,7 @@ const bundle0 = { moduleFormat: 'nestedEvaluate', source: '1+1' };
 const bundle0ID = makeB0ID(bundle0);
 
 const exportTest = test.macro(async (t, mode) => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   // const dbDir = 't-db';
 
@@ -234,7 +239,7 @@ test('export debug', exportTest, 'debug');
 test('export debug-on-pruned', exportTest, 'debug-on-pruned');
 
 test('export omits pruned span artifacts', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   // const dbDir = 't-db';
 

package/test/exportImport.test.js

@@ -6,10 +6,14 @@ import test from 'ava';
 import tmp from 'tmp';
 import bundleSource from '@endo/bundle-source';
 
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
+
 import { initSwingStore } from '../src/swingStore.js';
 import { makeSwingStoreExporter } from '../src/exporter.js';
 import { importSwingStore } from '../src/importer.js';
 
+const tmpDir = makeTempDirFactory(tmp);
+
 function makeExportLog() {
   const exportLog = [];
   const shadowStore = new Map();
@@ -33,21 +37,6 @@ function makeExportLog() {
   };
 }
 
-/**
- * @param {string} [prefix]
- * @returns {Promise<[string, () => void]>}
- */
-const tmpDir = prefix =>
-  new Promise((resolve, reject) => {
-    tmp.dir({ unsafeCleanup: true, prefix }, (err, name, removeCallback) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve([name, removeCallback]);
-      }
-    });
-  });
-
 async function embundle(filename) {
   const bundleFile = new URL(filename, import.meta.url).pathname;
   const bundle = await bundleSource(bundleFile);
@@ -96,7 +85,7 @@ const compareElems = (a, b) => a[0].localeCompare(b[0]);
 
 test('crank abort leaves no debris in export log', async t => {
   const exportLog = makeExportLog();
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const ssOut = initSwingStore(dbDir, {
@@ -176,7 +165,7 @@ async function testExportImport(
   failureMode = 'none',
 ) {
   const exportLog = makeExportLog();
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const keepTranscripts = runMode !== 'operational';

package/test/import.test.js

@@ -7,12 +7,14 @@ import { Buffer } from 'buffer';
 
 import sqlite3 from 'better-sqlite3';
 import test from 'ava';
+import tmp from 'tmp';
 import { decodeBase64 } from '@endo/base64';
 
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
+
 import { buffer } from '../src/util.js';
 import { importSwingStore, makeSwingStoreExporter } from '../src/index.js';
 
-import { tmpDir } from './util.js';
 import {
   buildData,
   bundle0,
@@ -29,6 +31,8 @@ const rank = {
   debug: 4,
 };
 
+const tmpDir = makeTempDirFactory(tmp);
+
 function convert(orig) {
   const bundles = Object.fromEntries(
     Object.entries(orig.bundles).map(([bundleID, encBundle]) => {
@@ -42,7 +46,7 @@ function convert(orig) {
 }
 
 test('import empty', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const exporter = makeExporter(new Map(), new Map());
   const ss = await importSwingStore(exporter, dbDir);
@@ -61,7 +65,7 @@ const importTest = test.macro(async (t, mode) => {
   /** @import {ArtifactMode} from '../src/internal.js' */
   const artifactMode = /** @type {ArtifactMode} */ (mode);
 
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const { exportData, artifacts, t0hash, t2hash, t5hash, t8hash } = buildData();
@@ -211,7 +215,7 @@ test('import archival', importTest, 'archival');
 test('import debug', importTest, 'debug');
 
 test('import is missing bundle', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -224,7 +228,7 @@ test('import is missing bundle', async t => {
 });
 
 test('import is missing snapshot', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -240,7 +244,7 @@ test('import is missing snapshot', async t => {
 });
 
 test('import is missing transcript span', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -265,7 +269,7 @@ test('import is missing transcript span', async t => {
 });
 
 test('import has mismatched transcript span', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -289,7 +293,7 @@ test('import has mismatched transcript span', async t => {
 });
 
 test('import has incomplete transcript span', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -320,7 +324,7 @@ test('import has incomplete transcript span', async t => {
 });
 
 test('import has corrupt transcript span', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -350,7 +354,7 @@ test('import has corrupt transcript span', async t => {
 });
 
 test('import has corrupt snapshot', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -373,7 +377,7 @@ test('import has corrupt snapshot', async t => {
 });
 
 test('import has corrupt bundle', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -389,7 +393,7 @@ test('import has corrupt bundle', async t => {
 });
 
 test('import has unknown metadata tag', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const exportData = new Map();
@@ -401,7 +405,7 @@ test('import has unknown metadata tag', async t => {
 });
 
 test('import has unknown artifact tag', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const artifacts = new Map();

package/test/repair-metadata.test.js

@@ -3,14 +3,18 @@
 import path from 'path';
 import test from 'ava';
 import sqlite3 from 'better-sqlite3';
+import tmp from 'tmp';
+
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
 
 import { importSwingStore, openSwingStore } from '../src/index.js';
 
 import { makeExporter, buildData } from './exports.js';
-import { tmpDir } from './util.js';
+
+const tmpDir = makeTempDirFactory(tmp);
 
 test('repair metadata', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const { exportData, artifacts } = buildData();
@@ -74,7 +78,7 @@ test('repair metadata', async t => {
 });
 
 test('repair metadata ignores kvStore entries', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const { exportData, artifacts } = buildData();
@@ -97,7 +101,7 @@ test('repair metadata ignores kvStore entries', async t => {
 });
 
 test('repair metadata rejects mismatched snapshot entries', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const { exportData, artifacts } = buildData();
@@ -120,7 +124,7 @@ test('repair metadata rejects mismatched snapshot entries', async t => {
 });
 
 test('repair metadata rejects mismatched transcript span', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
 
   const { exportData, artifacts } = buildData();

package/test/snapstore.test.js

@@ -8,10 +8,11 @@ import zlib from 'node:zlib';
 import sqlite3 from 'better-sqlite3';
 import tmp from 'tmp';
 
-import { makeMeasureSeconds } from '@agoric/internal';
+import { makeMeasureSeconds, makeTempDirFactory } from '@agoric/internal';
 import { makeSnapStore } from '../src/snapStore.js';
 import { makeArchiveSnapshot } from '../src/archiver.js';
-import { tmpDir } from './util.js';
+
+const tmpDir = makeTempDirFactory(tmp);
 
 function makeExportLog() {
   const exportLog = [];
@@ -36,7 +37,7 @@ harden(getSnapshotStream);
 test('compress to cache file; closes snapshot stream', async t => {
   const db = sqlite3(':memory:');
   const exportLog = makeExportLog();
-  const [archiveDir, cleanupArchives] = await tmpDir('archives');
+  const [archiveDir, cleanupArchives] = tmpDir('archives');
   t.teardown(cleanupArchives);
   const fsPowers = { fs, path, tmp };
   const archiveSnapshot = makeArchiveSnapshot(archiveDir, fsPowers);
@@ -127,7 +128,7 @@ test('snapStore prepare / commit delete is robust', async t => {
     measureSeconds: makeMeasureSeconds(() => 0),
   };
   const db = sqlite3(':memory:');
-  const [archiveDir, cleanupArchives] = await tmpDir('archives');
+  const [archiveDir, cleanupArchives] = tmpDir('archives');
   t.teardown(cleanupArchives);
   const fsPowers = { fs, path, tmp };
   const archiveSnapshot = makeArchiveSnapshot(archiveDir, fsPowers);

package/test/state.test.js

@@ -1,30 +1,19 @@
 // @ts-check
 
-import tmp from 'tmp';
 import test from 'ava';
+import tmp from 'tmp';
 
 import bundleSource from '@endo/bundle-source';
 
+import { makeTempDirFactory } from '@agoric/internal/src/tmpDir.js';
+
 import {
   initSwingStore,
   openSwingStore,
   isSwingStore,
 } from '../src/swingStore.js';
 
-/**
- * @param {string} [prefix]
- * @returns {Promise<[string, () => void]>}
- */
-const tmpDir = prefix =>
-  new Promise((resolve, reject) => {
-    tmp.dir({ unsafeCleanup: true, prefix }, (err, name, removeCallback) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve([name, removeCallback]);
-      }
-    });
-  });
+const tmpDir = makeTempDirFactory(tmp);
 
 async function embundle(filename) {
   const bundleFile = new URL(filename, import.meta.url).pathname;
@@ -121,9 +110,9 @@ test('in-memory kvStore read/write', t => {
 });
 
 test('persistent kvStore read/write/re-open', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
-  const exportLog = makeExportLog();
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
+  const exportLog = makeExportLog();
   t.is(isSwingStore(dbDir), false);
   const ss1 = initSwingStore(dbDir, { exportCallback: exportLog.callback });
   testKVStore(t, ss1, exportLog);
@@ -146,7 +135,7 @@ test('persistent kvStore maxKeySize write', async t => {
   // This tests that no matter what, we can write 254 unicode characters in the
   // 0x0800 - 0xFFFF range (single UTF-16 codepoint, but 3 byte UTF-8).
 
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   t.is(isSwingStore(dbDir), false);
   const { kernelStorage, hostStorage } = initSwingStore(dbDir);
@@ -164,7 +153,7 @@ const testTranscriptStore = test.macro({
   async exec(t, { ephemeral, keepTranscripts }) {
     let dbDir = null;
     if (!ephemeral) {
-      const [tmpPath, cleanup] = await tmpDir('testdb');
+      const [tmpPath, cleanup] = tmpDir('testdb');
       t.teardown(cleanup);
       t.is(isSwingStore(tmpPath), false);
       dbDir = tmpPath;
@@ -257,7 +246,7 @@ test(testTranscriptStore, { ephemeral: false, keepTranscripts: true });
 test(testTranscriptStore, { ephemeral: false, keepTranscripts: false });
 
 test('transcriptStore abort', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const { kernelStorage, hostStorage } = initSwingStore(dbDir);
   const { transcriptStore } = kernelStorage;
@@ -316,14 +305,14 @@ test('in-memory bundleStore read/write', async t => {
 });
 
 test('persistent bundleStore read/write', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   t.is(isSwingStore(dbDir), false);
   await testBundleStore(t, dbDir);
 });
 
 test('close will abort transaction', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const ss1 = initSwingStore(dbDir);
   ss1.kernelStorage.kvStore.set('key1', 'value');
@@ -341,7 +330,7 @@ test('close will abort transaction', async t => {
 });
 
 test('savepoints', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const ss1 = initSwingStore(dbDir);
   ss1.kernelStorage.startCrank();
@@ -360,7 +349,7 @@ test('savepoints', async t => {
 });
 
 test('savepoints do not automatically commit', async t => {
-  const [dbDir, cleanup] = await tmpDir('testdb');
+  const [dbDir, cleanup] = tmpDir('testdb');
   t.teardown(cleanup);
   const ss1 = initSwingStore(dbDir);
   ss1.kernelStorage.startCrank();

package/test/util.js

@@ -1,22 +1,6 @@
 import { Buffer } from 'node:buffer';
-import tmp from 'tmp';
 import { createSHA256 } from '../src/hasher.js';
 
-/**
- * @param {string} [prefix]
- * @returns {Promise<[string, () => void]>}
- */
-export const tmpDir = prefix =>
-  new Promise((resolve, reject) => {
-    tmp.dir({ unsafeCleanup: true, prefix }, (err, name, removeCallback) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve([name, removeCallback]);
-      }
-    });
-  });
-
 export async function* getSnapshotStream(contents) {
   yield Buffer.from(contents);
 }