@agoric/swing-store 0.9.2-dev-df4954e.0 → 0.9.2-dev-074abce.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swing-store",
-  "version": "0.9.2-dev-df4954e.0+df4954e",
+  "version": "0.9.2-dev-074abce.0+074abce",
   "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-df4954e.0+df4954e",
-    "@agoric/internal": "0.3.3-dev-df4954e.0+df4954e",
+    "@agoric/assert": "0.6.1-dev-074abce.0+074abce",
+    "@agoric/internal": "0.3.3-dev-074abce.0+074abce",
     "@endo/base64": "^1.0.5",
     "@endo/bundle-source": "^3.2.3",
     "@endo/check-bundle": "^1.0.7",
@@ -51,5 +51,5 @@
   "typeCoverage": {
     "atLeast": 76.3
   },
-  "gitHead": "df4954e5b7602b7f5284d91b581c91ac93203976"
+  "gitHead": "074abced7540692878d513933dd6d49d23e6f0c2"
 }

package/src/exporter.js

@@ -111,12 +111,6 @@ export function makeSwingStoreExporter(dirPath, options = {}) {
   const bundleStore = makeBundleStore(db, ensureTxn);
   const transcriptStore = makeTranscriptStore(db, ensureTxn, () => {});
 
-  if (artifactMode !== 'debug') {
-    // throw early if this DB will not be able to create all the desired artifacts
-    const internal = { snapStore, bundleStore, transcriptStore };
-    assertComplete(internal, artifactMode);
-  }
-
   const sqlKVGet = db.prepare(`
     SELECT value
     FROM kvStore
@@ -168,16 +162,25 @@ export function makeSwingStoreExporter(dirPath, options = {}) {
   }
   harden(getExportData);
 
-  /**
-   * @returns {AsyncIterableIterator<string>}
-   * @yields {string}
-   */
-  async function* getArtifactNames() {
+  /** @yields {string} */
+  async function* artifactNames() {
     yield* snapStore.getArtifactNames(artifactMode);
     yield* transcriptStore.getArtifactNames(artifactMode);
     yield* bundleStore.getArtifactNames();
   }
-  harden(getArtifactNames);
+  harden(artifactNames);
+
+  /**
+   * @returns {AsyncIterableIterator<string>}
+   */
+  function getArtifactNames() {
+    if (artifactMode !== 'debug') {
+      // throw if this DB will not be able to yield all the desired artifacts
+      const internal = { snapStore, bundleStore, transcriptStore };
+      assertComplete(internal, artifactMode);
+    }
+    return artifactNames();
+  }
 
   /**
    * @param {string} name

package/test/exportImport.test.js

@@ -220,15 +220,16 @@ async function testExportImport(
     await ssOut.hostStorage.commit();
   }
 
+  // the exporter may be broken (the swingstore may be incomplete), but that is
+  // signaled during `getArtifactNames()`, not during construction (which must
+  // finish quickly, without scanning the whole DB)
+  const exporter = makeSwingStoreExporter(dbDir, { artifactMode: exportMode });
+
   const incomplete = 'incomplete archival transcript: 3 vs 12';
-  function doExport() {
-    return makeSwingStoreExporter(dbDir, { artifactMode: exportMode });
-  }
   if (failureMode === 'export') {
-    await t.throws(doExport, { message: incomplete });
+    await t.throws(() => exporter.getArtifactNames(), { message: incomplete });
     return;
   }
-  const exporter = doExport();
 
   const exportData = [];
   for await (const elem of exporter.getExportData()) {