feat: convert the fakePriceAuthority to a PlayerPiano model (#1985)

* feat: convert the fakePriceAuthority to a PlayerPiano model It repeatedly runs through the list of prices provided at setup. This will be used to create a price oracle for the test net. tests updated * fix(fakePriceAuthority): remove some assumptions * chore: fix typo * chore: remove premature inversePriceAuthority.js * feat: add getPriceNotifier, more parameters to fakePriceAuthority * fix: calculate priceOutQuote using priceInQuote * chore: revert bad commit * test: update test-callSpread for playerPiano fakePriceAuthority * chore: clean up unintentional changes * test: update for new fakePriceAuthority * chore: fix tests * chore: lint-fix Co-authored-by: Michael FIG <mfig@agoric.com> Co-authored-by: Kate Sills <kate@agoric.com>
Agoric · Nov 6, 2020 · cd7ebd8 · cd7ebd8
1 parent c646bb6
commit cd7ebd8
Show file tree

Hide file tree

Showing 17 changed files with 405 additions and 347 deletions.
diff --git a/packages/ERTP/src/localAmountMath.js b/packages/ERTP/src/localAmountMath.js
@@ -2,7 +2,7 @@ import { E } from '@agoric/eventual-send';
 import { makeAmountMath } from './amountMath';
 
 /**
- * @param {Issuer} issuer
+ * @param {ERef<Issuer>} issuer
  * @returns {Promise<AmountMath>}
  */
 const makeLocalAmountMath = async issuer => {

diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/vat-priceAuthority.js b/packages/cosmic-swingset/lib/ag-solo/vats/vat-priceAuthority.js
@@ -1,7 +1,28 @@
 import { makePriceAuthorityRegistry } from '@agoric/zoe/tools/priceAuthorityRegistry';
+import { makeFakePriceAuthority } from '@agoric/zoe/tools/fakePriceAuthority';
+import { makeLocalAmountMath } from '@agoric/ertp';
 
 export function buildRootObject(_vatPowers) {
   return harden({
     makePriceAuthority: makePriceAuthorityRegistry,
+    async makeFakePriceAuthority(
+      issuerIn,
+      issuerOut,
+      priceList,
+      timer,
+      quoteInterval = undefined,
+    ) {
+      const [mathIn, mathOut] = await Promise.all([
+        makeLocalAmountMath(issuerIn),
+        makeLocalAmountMath(issuerOut),
+      ]);
+      return makeFakePriceAuthority(
+        mathIn,
+        mathOut,
+        priceList,
+        timer,
+        quoteInterval,
+      );
+    },
   });
 }
diff --git a/packages/zoe/src/contracts/loan/types.js b/packages/zoe/src/contracts/loan/types.js
@@ -158,6 +158,21 @@
  *   Used to tell the contract when a period has occurred
  *
  * @property {number} interestRate
+ *
+ * @property {ContractFacet} zcf
+ * @property {ConfigMinusGetDebt} configMinusGetDebt
+ */
+
+/**
+ * @typedef {Object} ConfigMinusGetDebt
+ * @property {ZCFSeat} collateralSeat
+ * @property {PromiseRecord<any>} liquidationPromiseKit
+ * @property {number} [mmr]
+ * @property {InstanceHandle} autoswapInstance
+ * @property {PriceAuthority} priceAuthority
+ * @property {AsyncIterable<undefined>} periodAsyncIterable
+ * @property {number} interestRate
+ * @property {ZCFSeat} lenderSeat
  */
 
 /**

diff --git a/packages/zoe/test/fakePriceAuthority.js b/packages/zoe/test/fakePriceAuthority.js
diff --git a/packages/zoe/test/unitTests/contracts/loan/test-addCollateral.js b/packages/zoe/test/unitTests/contracts/loan/test-addCollateral.js
@@ -8,7 +8,7 @@ import '@agoric/install-ses';
 import test from 'ava';
 
 import { makeAddCollateralInvitation } from '../../../../src/contracts/loan/addCollateral';
-import { makeFakePriceAuthority } from '../../../fakePriceAuthority';
+import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority';
 import buildManualTimer from '../../../../tools/manualTimer';
 
 import {
@@ -35,21 +35,14 @@ test('makeAddCollateralInvitation', async t => {
 
   const { zcfSeat: lenderSeat } = await zcf.makeEmptySeatKit();
 
-  const amountMaths = new Map();
-  amountMaths.set(
-    collateralKit.brand.getAllegedName(),
-    collateralKit.amountMath,
-  );
-  amountMaths.set(loanKit.brand.getAllegedName(), loanKit.amountMath);
-
-  const priceSchedule = {};
   const timer = buildManualTimer(console.log);
 
-  const priceAuthority = makeFakePriceAuthority(
-    amountMaths,
-    priceSchedule,
+  const priceAuthority = makeFakePriceAuthority({
+    mathIn: collateralKit.amountMath,
+    mathOut: loanKit.amountMath,
+    priceList: [],
     timer,
-  );
+  });
 
   const autoswapInstance = {};
   const getDebt = () => loanKit.amountMath.make(100);

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-borrow.js b/packages/zoe/test/unitTests/contracts/loan/test-borrow.js
@@ -1,4 +1,4 @@
-// ts-check
+// @ts-check
 
 import '../../../../exported';
 
@@ -22,7 +22,7 @@ import {
   makeAutoswapInstance,
 } from './helpers';
 
-import { makeFakePriceAuthority } from '../../../fakePriceAuthority';
+import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority';
 import buildManualTimer from '../../../../tools/manualTimer';
 
 import { makeBorrowInvitation } from '../../../../src/contracts/loan/borrow';
@@ -41,24 +41,16 @@ const setupBorrow = async (maxLoanValue = 100) => {
   );
   const mmr = 150;
 
-  const amountMaths = new Map();
-  amountMaths.set(
-    collateralKit.brand.getAllegedName(),
-    collateralKit.amountMath,
-  );
-  amountMaths.set(loanKit.brand.getAllegedName(), loanKit.amountMath);
-
-  const priceSchedule = [
-    { time: 0, price: 2 },
-    { time: 1, price: 1 },
-  ];
+  const priceList = [2, 1, 1, 1];
   const timer = buildManualTimer(console.log);
 
-  const priceAuthority = makeFakePriceAuthority(
-    amountMaths,
-    priceSchedule,
+  const priceAuthority = await makeFakePriceAuthority({
+    mathIn: collateralKit.amountMath,
+    mathOut: loanKit.amountMath,
+    priceList,
     timer,
-  );
+  });
+  await timer.tick();
 
   const initialLiquidityKeywordRecord = {
     Central: loanKit.amountMath.make(10000),
@@ -192,7 +184,7 @@ test('borrow getLiquidationPromise', async t => {
 
   const collateralGiven = collateralKit.amountMath.make(100);
 
-  const quoteIssuer = await E(priceAuthority).getQuoteIssuer(
+  const quoteIssuer = E(priceAuthority).getQuoteIssuer(
     collateralKit.brand,
     loanKit.brand,
   );
@@ -214,7 +206,7 @@ test('borrow getLiquidationPromise', async t => {
           amountIn: collateralGiven,
           amountOut: loanKit.amountMath.make(100),
           timer,
-          timestamp: 1,
+          timestamp: 2,
         },
       ]),
     ),
@@ -274,7 +266,7 @@ test('borrow, then addCollateral, then getLiquidationPromise', async t => {
           amountIn: collateralGiven,
           amountOut: loanKit.amountMath.make(103),
           timer,
-          timestamp: 2,
+          timestamp: 3,
         },
       ]),
     ),

diff --git a/packages/zoe/test/unitTests/contracts/loan/test-loan-e2e.js b/packages/zoe/test/unitTests/contracts/loan/test-loan-e2e.js
@@ -12,7 +12,7 @@ import { makeSubscriptionKit } from '@agoric/notifier';
 
 import { checkDetails, checkPayout } from './helpers';
 import { setup } from '../../setupBasicMints';
-import { makeFakePriceAuthority } from '../../../fakePriceAuthority';
+import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority';
 import buildManualTimer from '../../../../tools/manualTimer';
 
 const loanRoot = `${__dirname}/../../../../src/contracts/loan/`;
@@ -47,21 +47,14 @@ test('loan - lend - exit before borrow', async t => {
     Loan: loanKit.issuer,
   });
 
-  const amountMaths = new Map();
-  amountMaths.set(
-    collateralKit.brand.getAllegedName(),
-    collateralKit.amountMath,
-  );
-  amountMaths.set(loanKit.brand.getAllegedName(), loanKit.amountMath);
-
-  const priceSchedule = {};
   const timer = buildManualTimer(console.log);
 
-  const priceAuthority = makeFakePriceAuthority(
-    amountMaths,
-    priceSchedule,
+  const priceAuthority = makeFakePriceAuthority({
+    mathIn: collateralKit.amountMath,
+    mathOut: loanKit.amountMath,
+    priceList: [],
     timer,
-  );
+  });
 
   const { subscription: periodAsyncIterable } = makeSubscriptionKit();
 

diff --git a/packages/zoe/test/unitTests/contracts/test-automaticRefund.js b/packages/zoe/test/unitTests/contracts/test-automaticRefund.js
@@ -339,7 +339,6 @@ test('zoe - alice tries to complete after completion has already occurred', asyn
 
   await E(aliceSeat).getOfferResult();
 
-  console.log('EXPECTED ERROR: seat has been exited >>>');
   await t.throwsAsync(() => E(aliceSeat).tryExit(), {
     message: /seat has been exited/,
   });

diff --git a/packages/zoe/test/unitTests/contracts/test-brokenContract.js b/packages/zoe/test/unitTests/contracts/test-brokenContract.js
@@ -24,9 +24,6 @@ test('zoe - brokenAutomaticRefund', async t => {
 
   // Alice tries to create an instance, but the contract is badly
   // written.
-  console.log(
-    'EXPECTED ERROR: The contract did not correctly return a creatorInvitation',
-  );
   await t.throwsAsync(
     () => zoe.startInstance(installation, issuerKeywordRecord),
     { message: 'The contract did not correctly return a creatorInvitation' },