fix: experiments on #3448 for suggesting

Agoric · Aug 24, 2021 · 58d4361 · 58d4361
1 parent 370077f
commit 58d4361
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/packages/governance/src/types.js b/packages/governance/src/types.js
@@ -29,13 +29,25 @@
  */
 
 /**
- * @typedef { 'amount' | 'brand' | 'installation' | 'instance' | 'nat' |
- *   'ratio' | 'string' | 'unknown' } ParamType
+ * @typedef { Amount | Brand | Installation | Instance | bigint |
+ *   Ratio | string | unknown } ParamValue
  */
 
 /**
- * @typedef { Amount | Brand | Installation | Instance | bigint | Ratio |
- *   string | unknown } ParamValue
+ * @template T
+ * @typedef {{ type: T, name: string }} ParamRecord
+ */
+
+/**
+ * @typedef {ParamRecord<'amount'> & { value: Amount } |
+ *   ParamRecord<'brand'> & { value: Brand } |
+ *   ParamRecord<'installation'> & { value: Installation } |
+ *   ParamRecord<'instance'> & { value: Instance } |
+ *   ParamRecord<'nat'> & { value: bigint } |
+ *   ParamRecord<'ratio'> & { value: Ratio } |
+ *   ParamRecord<'string'> & { value: string } |
+ *   ParamRecord<'unknown'> & { value: unknown }
+ * } ParamDescription
  */
 
 /**
@@ -312,13 +324,6 @@
  * @property {Handle<'Ballot'>} handle
  */
 
-/**
- * @typedef {Object} ParamDescription
- * @property {string} name
- * @property {ParamValue} value
- * @property {ParamType} type
- */
-
 /**
  * @typedef {Object} ParamManagerBase
  * @property {() => Record<Keyword,ParamDescription>} getParams

diff --git a/packages/zoe/src/contractSupport/ratio.js b/packages/zoe/src/contractSupport/ratio.js
@@ -5,6 +5,7 @@ import { assert, details as X, q } from '@agoric/assert';
 import { Nat } from '@agoric/nat';
 import { AmountMath } from '@agoric/ertp';
 import { natSafeMath } from './safeMath.js';
+import { passStyleOf } from '@agoric/marshal';
 
 const { multiply, floorDivide, ceilDivide, add, subtract } = natSafeMath;
 
@@ -38,6 +39,7 @@ const PERCENT = 100n;
 const ratioPropertyNames = ['numerator', 'denominator'];
 
 export const assertIsRatio = ratio => {
+  assert.equal(passStyleOf(ratio), 'copyRecord');
   const propertyNames = Object.getOwnPropertyNames(ratio);
   assert(
     propertyNames.length === 2,