Improve brand check (#1000)

Agoric · Apr 27, 2020 · e303777 · e303777
1 parent f3b8449
commit e303777
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/packages/ERTP/src/amountMath.js b/packages/ERTP/src/amountMath.js
@@ -2,7 +2,7 @@
 import harden from '@agoric/harden';
 import { assert, details } from '@agoric/assert';
 
-import { mustBeSameStructure, mustBeComparable } from '@agoric/same-structure';
+import { mustBeComparable } from '@agoric/same-structure';
 import mathHelpersLib from './mathHelpersLib';
 
 /**
@@ -186,7 +186,10 @@ function makeAmountMath(brand, mathHelpersName) {
         allegedBrand !== undefined,
         details`alleged brand is undefined. Did you pass an extent rather than an amount?`,
       );
-      mustBeSameStructure(brand, allegedBrand, 'Unrecognized brand');
+      assert(
+        brand === allegedBrand,
+        details`the brand in the allegedAmount in 'coerce' didn't match the amountMath brand`,
+      );
       // Will throw on inappropriate extent
       return amountMath.make(extent);
     },

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js
@@ -10,7 +10,7 @@ import makeAmountMath from '../../../src/amountMath';
 
 const mockBrand = harden({
   isMyIssuer: () => false,
-  allegedName: () => 'mock',
+  getAllegedName: () => 'mock',
 });
 
 const amountMath = makeAmountMath(mockBrand, 'nat');
@@ -56,8 +56,11 @@ test('natMathHelpers', t => {
       `coerce can take an amount`,
     );
     t.throws(
-      () => coerce(harden({ brand: {}, extent: 4 })),
-      /Unrecognized brand/,
+      () =>
+        coerce(
+          harden({ brand: { getAllegedName: () => 'somename' }, extent: 4 }),
+        ),
+      /the brand in the allegedAmount in 'coerce' didn't match the amountMath brand/,
       `coerce can't take the wrong brand`,
     );
     t.throws(

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js
@@ -10,7 +10,7 @@ import makeAmountMath from '../../../src/amountMath';
 
 const mockBrand = harden({
   isMyIssuer: () => false,
-  allegedName: () => 'mock',
+  getAllegedName: () => 'mock',
 });
 
 const amountMath = makeAmountMath(mockBrand, 'set');

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js
@@ -10,7 +10,7 @@ import makeAmountMath from '../../../src/amountMath';
 
 const mockBrand = harden({
   isMyIssuer: () => false,
-  allegedName: () => 'mock',
+  getAllegedName: () => 'mock',
 });
 
 const amountMath = makeAmountMath(mockBrand, 'strSet');

diff --git a/packages/ERTP/test/unitTests/test-issuerObj.js b/packages/ERTP/test/unitTests/test-issuerObj.js
@@ -233,7 +233,7 @@ test('issuer.split bad amount', t => {
     const payment = mint.mintPayment(amountMath.make(1000));
     t.rejects(
       _ => E(issuer).split(payment, otherUnitOps.make(10)),
-      /Unrecognized brand/,
+      /the brand in the allegedAmount in 'coerce' didn't match the amountMath brand/,
       'throws for bad amount',
     );
   } catch (e) {