fixup! fix and test set bound

Author: erights

packages/ERTP/src/mathHelpers/setMathHelpers.js

@@ -1,5 +1,6 @@
 // @jessie-check
 
+import { Fail, q } from '@endo/errors';
 import { passStyleOf } from '@endo/pass-style';
 import { isKey, assertKey, mustMatch, matches } from '@endo/patterns';
 import {
@@ -57,6 +58,7 @@ export const setMathHelpers = harden({
         return true;
       }
     }
+    return false;
   },
   doIsEqual: (x, y) => elementsCompare(x, y) === 0,
   doAdd: elementsDisjointUnion,
@@ -69,19 +71,23 @@ export const setMathHelpers = harden({
       payload: [elementPatt, bound],
     } = rightBound;
     if (bound === 0n) {
-      return [];
+      return left;
     }
     let count = 0n;
     const result = [];
     for (const element of left) {
-      if (matches(element, elementPatt)) {
-        count += 1n;
+      if (count < bound) {
+        if (matches(element, elementPatt)) {
+          count += 1n;
+        } else {
+          result.push(element);
+        }
       } else {
         result.push(element);
       }
-      if (count >= bound) {
-        return result;
-      }
     }
+    count >= bound ||
+      Fail`Only has ${q(count)} matches, but needs at least ${bound}`;
+    return result;
   },
 });

packages/ERTP/test/unitTests/mathHelpers/copySetMathHelpers.test.js

@@ -287,7 +287,7 @@ test('copySet with strings subtract', t => {
       harden({ brand: mockBrand, value: makeCopySet(['a']) }),
     ),
     { brand: mockBrand, value: makeCopySet(['b']) },
-    `['a', 'b'] - ['a'] = ['a']`,
+    `['a', 'b'] - ['a'] = ['b']`,
   );
 });
 

packages/ERTP/test/unitTests/mathHelpers/setBoundMathHelpers.test.js

@@ -0,0 +1,56 @@
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { M } from '@endo/patterns';
+
+import { AmountMath as m } from '../../../src/index.js';
+import { mockSetBrand as mockBrand } from './mockBrand.js';
+
+const mock = value => harden({ brand: mockBrand, value });
+
+// The "unit tests" for MathHelpers actually make the calls through
+// AmountMath so that we can test that any duplication is handled
+// correctly.
+
+test('set minus setBound', t => {
+  t.deepEqual(
+    m.subtract(mock(['a', 'b']), mock(M.has(M.any(), 1n))),
+    mock(['a']),
+  );
+  t.deepEqual(m.subtract(mock(['a', 'b']), mock(M.has('a', 1n))), mock(['b']));
+  t.deepEqual(
+    m.subtract(mock(['a', 'b']), mock(M.has(M.any(), 1n))),
+    mock(['a']),
+  );
+  t.deepEqual(
+    m.subtract(mock(['a', 'b']), mock(M.has(M.any(), 0n))),
+    mock(['b', 'a']),
+  );
+  t.deepEqual(m.subtract(mock(['a', 'b']), mock(M.has(M.any(), 2n))), mock([]));
+
+  t.throws(() => m.subtract(mock(['a', 'b']), mock(M.has(M.any(), 3n))), {
+    message: 'Only has "[2n]" matches, but needs at least "[3n]"',
+  });
+
+  t.throws(() => m.subtract(mock(['a', 'b']), mock(M.has('c', 1n))), {
+    message: 'Only has "[0n]" matches, but needs at least "[1n]"',
+  });
+
+  t.throws(() => m.subtract(mock(['a', 'b']), mock(M.has(M.any()))), {
+    message:
+      'right amount bound: value: "[match:has]" - Must match one of ["[match:or]","[match:tagged]"]',
+  });
+});
+
+test('set isGTE setBound', t => {
+  t.true(m.isGTE(mock(['a', 'b']), mock(M.has(M.any(), 1n))));
+  t.true(m.isGTE(mock(['a', 'b']), mock(M.has('a', 1n))));
+  t.true(m.isGTE(mock(['a', 'b']), mock(M.has(M.any(), 1n))));
+  t.true(m.isGTE(mock(['a', 'b']), mock(M.has(M.any(), 0n))));
+  t.true(m.isGTE(mock(['a', 'b']), mock(M.has(M.any(), 2n))));
+  t.false(m.isGTE(mock(['a', 'b']), mock(M.has(M.any(), 3n))));
+  t.false(m.isGTE(mock(['a', 'b']), mock(M.has('c', 1n))));
+
+  t.throws(() => m.isGTE(mock(['a', 'b']), mock(M.has(M.any()))), {
+    message:
+      'right amount bound: value: "[match:has]" - Must match one of ["[match:or]","[match:tagged]"]',
+  });
+});

packages/ERTP/test/unitTests/mathHelpers/setMathHelpers.test.js

@@ -9,7 +9,11 @@ import { mockSetBrand as mockBrand } from './mockBrand.js';
 // AmountMath so that we can test that any duplication is handled
 // correctly.
 
-const runSetMathHelpersTests = (t, [a, b, c], a2) => {
+const runSetMathHelpersTests = (
+  t,
+  [a, b, c],
+  a2 = /** @type {any} */ (undefined),
+) => {
   // a2 is a copy of a which should have the same values but not same
   // identity. This doesn't make sense to use for handle tests, but
   // makes sense for anything where the identity is based on data.