feat(swingset): defaultManagerType option in makeSwingsetController

... and to buildVatController Set the default manager type to xs-worker in a couple tests: test-message-patterns in SwingSet test-splitPayments in ERTP ref #2260
Agoric · Jan 27, 2021 · 8198a23 · 8198a23
1 parent e3e7255
commit 8198a23
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/packages/ERTP/test/swingsetTests/splitPayments/test-splitPayments.js b/packages/ERTP/test/swingsetTests/splitPayments/test-splitPayments.js
@@ -5,7 +5,9 @@ import path from 'path';
 async function main(basedir, argv) {
   const dir = path.resolve(`${__dirname}/..`, basedir);
   const config = await loadBasedir(dir);
-  const controller = await buildVatController(config, argv);
+  const controller = await buildVatController(config, argv, {
+    defaultManagerType: 'xs-worker',
+  });
   await controller.run();
   return controller.dump();
 }

diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -50,6 +50,7 @@ export async function makeSwingsetController(
     debugPrefix = '',
     slogFile,
     testTrackDecref,
+    defaultManagerType = 'local',
   } = runtimeOptions;
   if (typeof Compartment === 'undefined') {
     throw Error('SES must be installed before calling makeSwingsetController');
@@ -205,7 +206,7 @@ export async function makeSwingsetController(
     FinalizationRegistry,
   };
 
-  const kernelOptions = { verbose, testTrackDecref };
+  const kernelOptions = { verbose, testTrackDecref, defaultManagerType };
   const kernel = buildKernel(kernelEndowments, deviceEndowments, kernelOptions);
 
   if (runtimeOptions.verbose) {
@@ -298,8 +299,14 @@ export async function buildVatController(
     kernelBundles,
     debugPrefix,
     testTrackDecref,
+    defaultManagerType,
   } = runtimeOptions;
-  const actualRuntimeOptions = { verbose, debugPrefix, testTrackDecref };
+  const actualRuntimeOptions = {
+    verbose,
+    debugPrefix,
+    testTrackDecref,
+    defaultManagerType,
+  };
   const initializationOptions = { verbose, kernelBundles };
   let bootstrapResult;
   if (!swingsetIsInitialized(hostStorage)) {

diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
@@ -104,7 +104,11 @@ export default function buildKernel(
     FinalizationRegistry,
   } = kernelEndowments;
   deviceEndowments = { ...deviceEndowments }; // copy so we can modify
-  const { verbose, testTrackDecref = false } = kernelOptions;
+  const {
+    verbose,
+    testTrackDecref = false,
+    defaultManagerType = 'local',
+  } = kernelOptions;
   const logStartup = verbose ? console.debug : () => 0;
 
   insistStorageAPI(hostStorage);
@@ -562,6 +566,7 @@ export default function buildKernel(
     startSubprocessWorkerNode,
     startXSnap,
     gcTools,
+    defaultManagerType,
   });
 
   function buildVatSyscallHandler(vatID, translators) {

diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vatManager/factory.js
@@ -16,6 +16,7 @@ export function makeVatManagerFactory({
   startSubprocessWorkerNode,
   startXSnap,
   gcTools,
+  defaultManagerType,
 }) {
   const localFactory = makeLocalVatManagerFactory({
     allVatPowers,
@@ -74,7 +75,7 @@ export function makeVatManagerFactory({
   // returns promise for new vatManager
   function vatManagerFactory(vatID, managerOptions) {
     validateManagerOptions(managerOptions);
-    const { managerType = 'local', setup, bundle } = managerOptions;
+    const { managerType = defaultManagerType, setup, bundle } = managerOptions;
 
     if (managerType === 'local') {
       if (setup) {

diff --git a/packages/SwingSet/test/test-message-patterns.js b/packages/SwingSet/test/test-message-patterns.js
@@ -73,6 +73,7 @@ test.before(async t => {
     creationOptions: {
       enablePipelining: true,
       enableSetup: true,
+      managerType: 'local',
     },
   };
   const moreVatTP = { bundle: kernelBundles.vattp };
@@ -97,7 +98,11 @@ test.before(async t => {
 
 export async function runVatsLocally(t, name) {
   const { localConfig: config, kernelBundles } = t.context.data;
-  const c = await buildVatController(config, [name], { kernelBundles });
+  const c = await buildVatController(config, [name], {
+    kernelBundles,
+    defaultManagerType: 'xs-worker',
+  });
+  t.teardown(c.shutdown);
   // await runWithTrace(c);
   await c.run();
   return c.dump().log;
@@ -134,7 +139,10 @@ export async function runVatsInComms(t, name) {
   };
   const hostStorage = initSwingStore().storage;
   await initializeSwingset(config, [name], hostStorage, { kernelBundles });
-  const c = await makeSwingsetController(hostStorage, deviceEndowments);
+  const c = await makeSwingsetController(hostStorage, deviceEndowments, {
+    defaultManagerType: 'xs-worker',
+  });
+  t.teardown(c.shutdown);
 
   // await runWithTrace(c);
   await c.run();