fixup! cleanProposal test

Author: erights

packages/zoe/test/unitTests/cleanProposal.test.js

@@ -5,6 +5,10 @@ import { cleanProposal } from '../../src/cleanProposal.js';
 import { setup } from './setupBasicMints.js';
 import buildManualTimer from '../../tools/manualTimer.js';
 
+/**
+ * @import {HasBound} from '@agoric/ertp';
+ */
+
 const proposeGood = (t, proposal, assetKind, expected) =>
   t.deepEqual(
     cleanProposal(harden(proposal), () => assetKind),
@@ -96,17 +100,20 @@ test('cleanProposal - wrong assetKind', t => {
 test('cleanProposal - want patterns', t => {
   const { moola, simoleans } = setup();
   const timer = buildManualTimer(t.log);
+  const wantAsset2HasBound = simoleans(
+    /** @type {HasBound} */ (M.containerHas(M.any())),
+  );
 
   proposeGood(
     t,
     {
-      want: { Asset2: M.any() },
+      want: { Asset2: wantAsset2HasBound },
       give: { Price2: moola(3n) },
       exit: { afterDeadline: { timer, deadline: 100n } },
     },
     'nat',
     {
-      want: { Asset2: M.any() },
+      want: { Asset2: wantAsset2HasBound },
       give: { Price2: moola(3n) },
       exit: { afterDeadline: { timer, deadline: 100n } },
     },
@@ -127,22 +134,22 @@ test('cleanProposal - want patterns', t => {
     t,
     {
       want: { Asset2: simoleans(1n) },
-      give: { Price2: M.any() },
+      give: { Price2: M.containerHas(M.any()) },
       exit: { afterDeadline: { timer, deadline: 100n } },
     },
     'nat',
-    'A passable tagged "match:any" is not a key: "[match:any]"',
+    'A passable tagged "match:containerHas" is not a key: "[match:containerHas]"',
   );
 
   proposeBad(
     t,
     {
       want: { Asset2: simoleans(1n) },
-      give: { Price2: M.any() },
+      give: { Price2: M.containerHas(M.any()) },
       exit: { afterDeadline: { timer, deadline: M.any() } },
     },
     'nat',
-    'A passable tagged "match:any" is not a key: "[match:any]"',
+    'A passable tagged "match:containerHas" is not a key: "[match:containerHas]"',
   );
 });
 

packages/zoe/test/unitTests/setupBasicMints.js

@@ -1,10 +1,11 @@
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { makeIssuerKit } from '@agoric/ertp';
 import { makeScalarMapStore } from '@agoric/store';
 import { makeZoeForTest } from '../../tools/setup-zoe.js';
 import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
 
 /**
  * @import {MapStore} from '@agoric/swingset-liveslots';
+ * @import {AmountBound, AmountValueBound} from '@agoric/ertp';
  */
 
 export const setup = () => {
@@ -26,8 +27,13 @@ export const setup = () => {
   const { admin: fakeVatAdmin, vatAdminState } = makeFakeVatAdmin();
   const zoe = makeZoeForTest(fakeVatAdmin);
 
-  /** @type {(brand: Brand<'nat'>) => (value: bigint) => Amount<'nat'>} */
-  const makeSimpleMake = brand => value => AmountMath.make(brand, value);
+  // The following more correct type causes an explosion of new lint errors
+  // /**
+  //  * @template {AssetKind} [AK='nat']
+  //  * @param {Brand<AK>} brand
+  //  * @returns {(value: AmountValueBound<AK>) => AmountBound<AK>}
+  //  */
+  const makeSimpleMake = brand => value => harden({ brand, value });
 
   const result = {
     moolaIssuer: moolaKit.issuer,