fixup! amountMat

Author: erights

packages/ERTP/src/amountMath.js

@@ -9,9 +9,8 @@ import { copyBagMathHelpers } from './mathHelpers/copyBagMathHelpers.js';
 import { AmountShape } from './typeGuards.js';
 
 /**
- * @import {Passable} from '@endo/pass-style'
  * @import {Key, CopyBag, CopySet} from '@endo/patterns';
- * @import {Amount, AmountBound, AmountHasBound, AmountValue, AssetValueForKind, Brand, CopyBagAmount, CopySetAmount, MathHelpers, NatAmount, NatValue, SetAmount, SetValue} from './types.js';
+ * @import {Amount, AmountBound, AssetValueForKind, Brand, CopyBagAmount, CopySetAmount, MathHelpers, NatAmount, NatValue, SetAmount, SetValue, HasBound} from './types.js';
  */
 
 // NB: AssetKind is both a constant for enumerated values and a type for those values.
@@ -198,15 +197,13 @@ const coerceLR = (h, leftAmount, rightAmount) => {
  * @returns {boolean}
  */
 const isGTE = (leftAmount, rightAmountBound, brand = undefined) => {
-  if (kindOf(rightAmountBound) === 'match:containerHas') {
+  const { brand: rightBrand, value: rightValueBound } = rightAmountBound;
+  if (kindOf(rightValueBound) === 'match:containerHas') {
     mustMatch(leftAmount, AmountShape, 'left amount');
     const { brand: leftBrand, value: leftValue } = leftAmount;
     const {
-      brand: rightBrand,
-      value: {
-        payload: [elementPatt, bound],
-      },
-    } = /** @type {AmountHasBound} */ (rightAmountBound);
+      payload: [elementPatt, bound],
+    } = /** @type {HasBound} */ (rightValueBound);
     optionalBrandCheck(leftBrand, brand);
     optionalBrandCheck(rightBrand, brand);
     leftBrand === rightBrand ||
@@ -392,15 +389,13 @@ export const AmountMath = {
    * @returns {L}
    */
   subtract: (leftAmount, rightAmountBound, brand = undefined) => {
-    if (kindOf(rightAmountBound) === 'match:containerHas') {
+    const { brand: rightBrand, value: rightValueBound } = rightAmountBound;
+    if (kindOf(rightValueBound) === 'match:containerHas') {
       mustMatch(leftAmount, AmountShape, 'left amount');
       const { brand: leftBrand, value: leftValue } = leftAmount;
       const {
-        brand: rightBrand,
-        value: {
-          payload: [elementPatt, bound],
-        },
-      } = /** @type {AmountHasBound} */ (rightAmountBound);
+        payload: [elementPatt, bound],
+      } = /** @type {HasBound} */ (rightValueBound);
       optionalBrandCheck(leftBrand, brand);
       optionalBrandCheck(rightBrand, brand);
       leftBrand === rightBrand ||