fixup! feat(SwingSet): force reload from snapshot

clarify startXSnap init details
Agoric · Apr 30, 2023 · f990398 · f990398
1 parent c3f055d
commit f990398
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/SwingSet/src/controller/startXSnap.js b/packages/SwingSet/src/controller/startXSnap.js
@@ -13,8 +13,8 @@ const NETSTRING_MAX_CHUNK_SIZE = 12_000_000;
  */
 
 /**
- * @typedef {object} StartXSnapLoadFromSnapshotDetails
- * @property {'snapshot'} source
+ * @typedef {object} StartXSnapInitFromSnapshotStreamDetails
+ * @property {'snapshotStream'} from
  * @property {AsyncIterable<Uint8Array>} snapshotStream
  * @property {string} [snapshotDescription]
  */
@@ -27,7 +27,7 @@ const NETSTRING_MAX_CHUNK_SIZE = 12_000_000;
  * TODO: transition to direct snapshot stream, and remove this option
  */
 
-/** @typedef {StartXSnapInitFromBundlesDetails | StartXSnapLoadFromSnapshotDetails | StartXSnapInitFromSnapStoreDetails} StartXSnapInitDetails */
+/** @typedef {StartXSnapInitFromBundlesDetails | StartXSnapInitFromSnapshotStreamDetails | StartXSnapInitFromSnapStoreDetails} StartXSnapInitDetails */
 
 /** @typedef {ReturnType<typeof makeStartXSnap>} StartXSnap */
 
@@ -108,10 +108,10 @@ export function makeStartXSnap(options) {
         return { snapshotStream, snapshotDescription };
       }
 
-    if (loadDetails.source === 'snapshot') {
-      const { snapshotStream, snapshotDescription } = loadDetails;
-      return { snapshotStream, snapshotDescription };
-    }
+      case 'snapshotStream': {
+        const { snapshotStream, snapshotDescription } = initDetails;
+        return { snapshotStream, snapshotDescription };
+      }
 
       default:
         // @ts-expect-error exhaustive check

diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
@@ -261,8 +261,8 @@ export function makeXsSubprocessFactory({
           bundleIDs,
           handleCommand: handleCommandKit.handleCommand,
           metered,
-          load: {
-            source: 'snapshot',
+          init: {
+            from: 'snapshotStream',
             snapshotStream: restartWorkerStream,
             snapshotDescription,
           },