fix: removed another q

Agoric · Feb 13, 2021 · 8e20245 · 8e20245
1 parent 17d7df6
commit 8e20245
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vatManager/factory.js
@@ -70,7 +70,8 @@ export function makeVatManagerFactory({
       !bundle || typeof bundle === 'object',
       `bundle must be object, not a plain string`,
     );
-    assert(!setup || enableSetup, X`setup() provided, but not enabled`); // todo maybe useless
+    // todo maybe useless
+    assert(!(setup && !enableSetup), X`setup() provided, but not enabled`);
   }
 
   // returns promise for new vatManager

diff --git a/packages/SwingSet/src/netstring.js b/packages/SwingSet/src/netstring.js
@@ -1,4 +1,4 @@
-import { assert, details as X, q } from '@agoric/assert';
+import { assert, details as X } from '@agoric/assert';
 
 // adapted from 'netstring-stream', https://github.com/tlivings/netstring-stream/
 const { Transform } = require('stream');
@@ -51,7 +51,7 @@ export function decode(data) {
     const size = parseInt(sizeString, 10);
     if (!(size > -1)) {
       // reject NaN, all negative numbers
-      assert.fail(X`unparseable size ${q(sizeString)}, should be integer`);
+      assert.fail(X`unparseable size ${sizeString}, should be integer`);
     }
     if (data.length < colon + 1 + size + 1) {
       break; // still waiting for `${DATA}.`

diff --git a/packages/SwingSet/test/test-netstring.js b/packages/SwingSet/test/test-netstring.js
@@ -106,7 +106,7 @@ test('decode', t => {
   }
 
   // bad('a', 'non-numeric length prefix');
-  bad('a:', `unparseable size "a", should be integer`);
+  bad('a:', /unparseable size .*, should be integer/);
   bad('1:ab', 'malformed netstring: not terminated by comma');
 });