#40 Made paramManagers work again, removed copy-paste code and used i…

…mported ones instead, should update timer.tick() and test numbers

contract/src/lendingPool/lendingPool.js

@@ -74,7 +74,7 @@ const trace = makeTracer('LendingPool');
  * since we might add a DAO later.
  *
  * @param {ZCF} zcf
- * @param {{initialPoserInvitation: Invitation}} privateArgs
+ * @param {{initialPoserInvitation: Invitation, storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller>}} privateArgs
  */
 export const start = async (zcf, privateArgs) => {
   /** @type {LendingPoolTerms}*/
@@ -88,9 +88,11 @@ export const start = async (zcf, privateArgs) => {
     compareCurrencyBrand,
   } = terms;
 
-  const { initialPoserInvitation } = privateArgs;
+  const { initialPoserInvitation, storageNode, marshaller } = privateArgs;
   const electorateParamManager = await makeElectorateParamManager(
     E(zcf).getZoeService(),
+    storageNode,
+    marshaller,
     initialPoserInvitation,
   );
 
@@ -169,7 +171,7 @@ export const start = async (zcf, privateArgs) => {
       initialExchangeRate,
     });
 
-    const poolParamManager = makePoolParamManager(ratesUpdated);
+    const poolParamManager = makePoolParamManager(storageNode, marshaller, ratesUpdated);
     poolParamManagers.init(underlyingBrand, poolParamManager);
 
     const [startTimeStamp, priceAuthNotifier] = await Promise.all([

contract/src/lendingPool/loanStoreUtils.js

@@ -1,4 +1,4 @@
-import { keyEQ, keyLT } from '@agoric/store';
+import { keyEQ, keyLT, makeScalarMap } from '@agoric/store';
 import { AmountMath } from '@agoric/ertp';
 import { toVaultKey } from '@agoric/inter-protocol/src/vaultFactory/storeUtils.js';
 import { makeOrderedVaultStore } from '@agoric/inter-protocol/src/vaultFactory/orderedVaultStore.js';
@@ -26,7 +26,7 @@ import { LoanPhase } from './loan.js'
  * @return {LoanStore}
  */
 export const makeLoanStoreUtils = () => {
-  const store = makeOrderedVaultStore('store');
+  const store = makeOrderedVaultStore(makeScalarMap('store'));
   let firstKey;
   let reschedule;
 

contract/src/lendingPool/params.js

@@ -8,7 +8,7 @@ import {
   CONTRACT_ELECTORATE,
   ParamTypes
 } from '@agoric/governance';
-import { makeStoredPublishKit } from '@agoric/notifier';
+import { makeStoredPublisherKit } from '@agoric/notifier';
 
 export const CHARGING_PERIOD_KEY = 'ChargingPeriod';
 export const RECORDING_PERIOD_KEY = 'RecordingPeriod';
@@ -49,7 +49,7 @@ const makeLoanParams = (loanTiming, rates) => {
  * @param {LendingPoolTiming} initialValues
  */
 const makeLoanTimingManager = (storageNode, marshaller, initialValues) => {
-  return makeParamManagerSync(makeStoredPublishKit(storageNode, marshaller),{
+  return makeParamManagerSync(makeStoredPublisherKit(storageNode, marshaller),{
     [CHARGING_PERIOD_KEY]: [ParamTypes.NAT, initialValues.chargingPeriod],
     [RECORDING_PERIOD_KEY]: [ParamTypes.NAT, initialValues.recordingPeriod],
     [PRICE_CHECK_PERIOD_KEY]: [ParamTypes.NAT, initialValues.priceCheckPeriod] // TODO this now deprecated and not being used anywhere, should remove it
@@ -62,7 +62,7 @@ const makeLoanTimingManager = (storageNode, marshaller, initialValues) => {
  * @param {Rates} rates
  */
 const makeLoanParamManager = (storageNode, marshaller, rates) => {
-  return makeParamManagerSync(makeStoredPublishKit(storageNode, marshaller), {
+  return makeParamManagerSync(makeStoredPublisherKit(storageNode, marshaller), {
     [LIQUIDATION_MARGIN_KEY]: [ParamTypes.RATIO, rates.liquidationMargin],
   })
 };
@@ -73,7 +73,7 @@ const makeLoanParamManager = (storageNode, marshaller, rates) => {
  * @param {Rates} rates
  */
 const makePoolParamManager = (storageNode, marshaller, rates) => {
-  return makeParamManagerSync(makeStoredPublishKit(storageNode, marshaller), {
+  return makeParamManagerSync(makeStoredPublisherKit(storageNode, marshaller), {
     [LIQUIDATION_MARGIN_KEY]: [ParamTypes.RATIO, rates.liquidationMargin],
     [INITIAL_EXCHANGE_RATE_KEY]: [ParamTypes.RATIO, rates.initialExchangeRate],
     [BASE_RATE_KEY]: [ParamTypes.RATIO, rates.baseRate],
@@ -95,7 +95,7 @@ const makePoolParamManager = (storageNode, marshaller, rates) => {
  * }>}
  */
 const makeElectorateParamManager = async (zoe, storageNode, marshaller, electorateInvitation) => {
-  return makeParamManager(makeStoredPublishKit(storageNode, marshaller), {
+  return makeParamManager(makeStoredPublisherKit(storageNode, marshaller), {
       [CONTRACT_ELECTORATE]: [ParamTypes.INVITATION, electorateInvitation],
     },
     zoe);

contract/src/lendingPool/poolManager.js

@@ -401,7 +401,8 @@ export const makePoolManager = (
     },
   };
 
-  observeNotifier(periodNotifier, timeObserver);
+  observeNotifier(periodNotifier, timeObserver)
+    .catch(error => console.log('Error building observer', error));
 
   /** @type {ManagerFacet} */
   const managerFacet = harden({

contract/test/lendingPool/helpers.js

@@ -7,7 +7,7 @@ import { makeTracer } from '@agoric/run-protocol/src/makeTracer.js';
 import * as Collect from '@agoric/run-protocol/src/collect.js';
 import { floorDivideBy } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
-import { waitForPromisesToSettle } from './test-lendingPool.js';
+import { eventLoopIteration } from '@agoric/zoe/tools/eventLoopIteration.js';
 
 const trace = makeTracer('Helper');
 const BASIS_POINTS = 10000n;
@@ -135,7 +135,7 @@ export const adjust = async (zoe, loan, collateralConfig = undefined, debtConfig
     { collateralUnderlyingBrand },
   );
 
-  await waitForPromisesToSettle();
+  await eventLoopIteration();
 
   return seat;
 };
@@ -179,7 +179,7 @@ export const closeLoan = async (
     proposal,
     payment,
   );
-  await waitForPromisesToSettle();
+  await eventLoopIteration();
 
   return seat;
 };

contract/test/lendingPool/lendingPoolScenrioHelpers.js

@@ -9,7 +9,7 @@ import {
 } from './helpers.js';
 import { AmountMath } from '@agoric/ertp';
 import { Nat } from '@agoric/nat';
-import { waitForPromisesToSettle } from './test-lendingPool.js';
+import { eventLoopIteration } from '@agoric/zoe/tools/eventLoopIteration.js';
 import { makeScalarMap } from '@agoric/store';
 import { floorDivideBy, floorMultiplyBy, makeRatio, oneMinus } from '@agoric/zoe/src/contractSupport/index.js';
 
@@ -209,7 +209,7 @@ export const makeLendingPoolScenarioHelpers = (
       { collateralUnderlyingBrand },
     );
 
-    await waitForPromisesToSettle();
+    await eventLoopIteration();
 
     return seat;
   };
@@ -243,7 +243,7 @@ export const makeLendingPoolScenarioHelpers = (
       proposal,
       payment,
     );
-    await waitForPromisesToSettle();
+    await eventLoopIteration();
 
     return seat;
   };
@@ -282,7 +282,7 @@ export const makeLendingPoolScenarioHelpers = (
       redeemPaymentRecord
     );
 
-    await waitForPromisesToSettle();
+    await eventLoopIteration();
     return redeemUserSeat
   };
 

contract/test/lendingPool/setup.js

@@ -68,7 +68,7 @@ export const setupServices = async (
   ammPoolsConfig = undefined,
 ) => {
   const {
-    zoe,
+    farZoeKit: { zoe },
     compareCurrencyKit: { brand: compCurrencyBrand },
     vanKit: { mint: vanMint },
     panKit: { mint: panMint },
@@ -228,7 +228,9 @@ export const startLendingPool = async (
     instance.consume.economicCommittee,
     contractGovernor,
   ]);
+
   const ammPublicFacet = await E(zoe).getPublicFacet(ammInstance);
+  console.log('ammPublicFacet', ammPublicFacet)
   const priceManager = await priceManagerP;
   const timer = await chainTimerService;
   const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
@@ -246,23 +248,26 @@ export const startLendingPool = async (
     compareBrand,
     undefined
   );
-  // console.log("loanFactoryTerms", loanFactoryTerms)
+
   const governorTerms = harden({
     timer,
     electorateInstance,
     governedContractInstallation: installations.LendingPool,
     governed: {
       terms: loanFactoryTerms,
       issuerKeywordRecord: {},
-      privateArgs: harden({ initialPoserInvitation }),
     },
   });
   const { creatorFacet: governorCreatorFacet, instance: governorInstance } =
     await E(zoe).startInstance(
       contractGovernorInstall,
       undefined,
       governorTerms,
-      harden({ electorateCreatorFacet }),
+      harden({
+        electorateCreatorFacet, governed: {
+          initialPoserInvitation, storageNode, marshaller,
+        },
+      }),
     );
 
   const [lendingPoolInstance, lendingPoolCreator] = await Promise.all([