chore: incorporate review feedback

Agoric · Jul 2, 2020 · b097460 · b097460
1 parent 94761da
commit b097460
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 49 deletions.
diff --git a/.github/workflows/ag-solo-xs.yml b/.github/workflows/ag-solo-xs.yml
@@ -63,21 +63,21 @@ jobs:
         exit $status
         EOF
         sudo chmod +x "$nf"
-    - name: test eventual-send on xs
+    - name: test same-structure on xs
       run: |
         export MODDABLE=$HOME/moddable
         export PATH=$MODDABLE/build/bin/lin/release:$PATH
         export TAPE=$HOME/tape-xs
-        cd packages/eventual-send
+        cd packages/same-structure
         node -r esm $TAPE/bin/tape-xs-build.js $PWD test/test*.js
         noflake mcconfig -m -p x-cli-lin test-xs-manifest.json
-        $MODDABLE/build/bin/lin/release/eventual-send
-    - name: test marshal on xs
+        $MODDABLE/build/bin/lin/release/same-structure
+    - name: test weak-store on xs
       run: |
         export MODDABLE=$HOME/moddable
         export PATH=$MODDABLE/build/bin/lin/release:$PATH
         export TAPE=$HOME/tape-xs
-        cd packages/marshal
+        cd packages/weak-store
         node -r esm $TAPE/bin/tape-xs-build.js $PWD test/test*.js
         noflake mcconfig -m -p x-cli-lin test-xs-manifest.json
-        $MODDABLE/build/bin/lin/release/marshal
+        $MODDABLE/build/bin/lin/release/weak-store
diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -1,5 +1,4 @@
 /* global Compartment harden */
-// eslint-disable-next-line no-redeclare
 
 import fs from 'fs';
 import path from 'path';
@@ -169,11 +168,7 @@ export async function buildVatController(config, argv = []) {
   // import anything outside their bundle.
 
   function vatRequire(what) {
-    if (what === '@agoric/harden') {
-      return harden;
-    } else {
-      throw Error(`vatRequire unprepared to satisfy require(${what})`);
-    }
+    throw Error(`vatRequire unprepared to satisfy require(${what})`);
   }
 
   const vatEndowments = harden({

diff --git a/packages/SwingSet/test/test-vat-imports.js b/packages/SwingSet/test/test-vat-imports.js
diff --git a/packages/SwingSet/test/vat-imports-1.js b/packages/SwingSet/test/vat-imports-1.js
diff --git a/packages/acorn-eventual-send/test/test-rollup.js b/packages/acorn-eventual-send/test/test-rollup.js
@@ -8,7 +8,7 @@ test('SwingSet bug', async t => {
     const bundle = await rollup({
       input: require.resolve('../encouragementBotCommsWavyDot/bootstrap.js'),
       treeshake: false,
-      external: ['@agoric/evaluate', '@agoric/nat'],
+      external: [],
       acornInjectPlugins: [eventualSend(acorn)],
     });
     t.ok(bundle);