Merge pull request #1687 from Agoric/1609-confusing-error-message

Fix bug #1609, confusing error message on malformed vat code
Agoric · Sep 3, 2020 · 918f56b · 918f56b
2 parents f35026a + 1e87530
commit 918f56b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/SwingSet/src/kernel/vatManager/localVatManager.js b/packages/SwingSet/src/kernel/vatManager/localVatManager.js
@@ -149,13 +149,17 @@ export function makeLocalVatManagerFactory(tools) {
         vatPowers,
         vatParameters,
       );
-    } else {
+    } else if (enableSetup) {
       const setup = vatNS.default;
       assert(setup, `vat source bundle lacks (default) setup() function`);
-      assert(setup instanceof Function, `setup is not a function`);
-      assert(enableSetup, `got setup(), but not options.enableSetup`);
+      assert(
+        setup instanceof Function,
+        `vat source bundle default export is not a function`,
+      );
       const helpers = harden({}); // DEPRECATED, todo remove from setup()
       dispatch = setup(syscall, state, helpers, vatPowers);
+    } else {
+      throw Error(`vat source bundle lacks buildRootObject() function`);
     }
 
     const manager = finish(dispatch, meterRecord);