feat: swingset-runner zoe demos to use pre-bundled zcf

Agoric · Aug 12, 2020 · 3df964a · 3df964a
1 parent a9200b4
commit 3df964a
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -152,7 +152,9 @@ export function loadSwingsetConfigFile(configPath) {
     if (!config.bootstrap) {
       throw Error(`no designated bootstrap vat in ${configPath}`);
     } else if (!config.vats[config.bootstrap]) {
-      throw Error(`bootstrap vat ${config.bootstrap} not found in ${configPath}`);
+      throw Error(
+        `bootstrap vat ${config.bootstrap} not found in ${configPath}`,
+      );
     }
     return config;
   } catch (e) {

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/swingset.json b/packages/swingset-runner/demo/exchangeBenchmark/swingset.json
@@ -0,0 +1,25 @@
+{
+  "bootstrap": "bootstrap",
+  "bundles": {
+    "zcf": {
+      "sourcePath": "../../../zoe/src/contractFacet.js"
+    }
+  },
+  "vats": {
+    "alice": {
+      "sourcePath": "vat-alice.js"
+    },
+    "bob": {
+      "sourcePath": "vat-bob.js"
+    },
+    "zoe": {
+      "sourcePath": "vat-zoe.js",
+      "parameters": {
+        "zcfBundleName": "zcf"
+      }
+    },
+    "bootstrap": {
+      "sourcePath": "bootstrap.js"
+    }
+  }
+}
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/vat-zoe.js b/packages/swingset-runner/demo/exchangeBenchmark/vat-zoe.js
@@ -2,8 +2,8 @@
 
 import { makeZoe } from '@agoric/zoe';
 
-export function buildRootObject(_vatPowers) {
+export function buildRootObject(_vatPowers, vatParameters) {
   return harden({
-    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc),
+    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc, vatParameters.zcfBundleName),
   });
 }
diff --git a/packages/swingset-runner/demo/zoeTests/swingset.json b/packages/swingset-runner/demo/zoeTests/swingset.json
@@ -1,5 +1,10 @@
 {
   "bootstrap": "bootstrap",
+  "bundles": {
+    "zcf": {
+      "sourcePath": "../../../zoe/src/contractFacet.js"
+    }
+  },
   "vats": {
     "alice": {
       "sourcePath": "vat-alice.js"
@@ -14,7 +19,10 @@
       "sourcePath": "vat-dave.js"
     },
     "zoe": {
-      "sourcePath": "vat-zoe.js"
+      "sourcePath": "vat-zoe.js",
+      "parameters": {
+        "zcfBundleName": "zcf"
+      }
     },
     "bootstrap": {
       "sourcePath": "bootstrap.js",

diff --git a/packages/swingset-runner/demo/zoeTests/vat-zoe.js b/packages/swingset-runner/demo/zoeTests/vat-zoe.js
@@ -2,8 +2,8 @@
 
 import { makeZoe } from '@agoric/zoe';
 
-export function buildRootObject(_vatPowers) {
+export function buildRootObject(_vatPowers, vatParameters) {
   return harden({
-    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc),
+    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc, vatParameters.zcfBundleName),
   });
 }
diff --git a/packages/swingset-runner/src/main.js b/packages/swingset-runner/src/main.js
@@ -1,5 +1,4 @@
 import path from 'path';
-import fs from 'fs';
 import process from 'process';
 import repl from 'repl';
 import util from 'util';