Merge pull request #50 from anilhelvaci/feature/update-to-community-dev

Update agoric-sdk to community-dev branch
anilhelvaci · Dec 21, 2022 · 8b2b774 · 8b2b774
2 parents 0b25bb2 + 124265a
commit 8b2b774
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/contract/src/governance/lendingPoolElectorate.js b/contract/src/governance/lendingPoolElectorate.js
@@ -33,6 +33,7 @@ const start = (zcf) => {
 
   const addQuestion = async (counterInstallation, questionSpec) => {
     assertGovernedContextInitialized(governedContext);
+    const { publisher: outcomePublisher } = makePublishKit();
 
     const { publicFacet, instance } = await startCounter(
       zcf,
@@ -41,6 +42,7 @@ const start = (zcf) => {
       counterInstallation,
       allQuestions,
       questionsPublisher,
+      outcomePublisher,
     );
 
     return { publicFacet, instance };

diff --git a/contract/src/lendingPool/lendingPool.js b/contract/src/lendingPool/lendingPool.js
@@ -4,7 +4,6 @@ import '@agoric/zoe/exported.js';
 import '@agoric/zoe/src/contracts/exported.js';
 
 import { E } from '@endo/far';
-import '@agoric/governance/src/exported.js';
 import { AmountMath, AssetKind } from '@agoric/ertp';
 import { makeTracer } from '@agoric/inter-protocol/src/makeTracer.js';
 import { makeScalarMap } from '@agoric/store';

diff --git a/contract/test/lendingPool/setup.js b/contract/test/lendingPool/setup.js
@@ -20,7 +20,8 @@ import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { makeGovernedTerms } from '../../src/lendingPool/params.js';
 import { setupAMMBootstrap } from '@agoric/inter-protocol/test/amm/vpool-xyk-amm/setup.js';
 import { provideBundle } from '@agoric/inter-protocol/test/supports.js';
-import { setupAmm, setupReserve, startEconomicCommittee } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+import { setupAmm, setupReserve } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+import { startEconomicCommittee } from '@agoric/inter-protocol/src/proposals/startEconCommittee.js';
 import { makePriceManager } from '../../src/lendingPool/priceManager.js';
 import { makeLendingPoolScenarioHelpers } from './lendingPoolScenrioHelpers.js';
 import { makeLendingPoolAssertions } from './lendingPoolAssertions.js';
@@ -355,21 +356,23 @@ export const setupAmmAndElectorate = async (
     counter: installation.consume.binaryVoteCounter,
   });
 
-  const governorCreatorFacet = consume.ammGovernorCreatorFacet;
+  const {
+    creatorFacet: ammCreatorFacet,
+    instanceWithoutReserve: governedInstance,
+    governorCreatorFacet,
+    publicFacet: ammPublicFacet
+  } = await consume.ammKit;
+
   const governorInstance = await instance.consume.ammGovernor;
   const governorPublicFacet = await E(zoe).getPublicFacet(governorInstance);
   const g = {
     governorInstance,
     governorPublicFacet,
     governorCreatorFacet,
   };
-  const governedInstance = E(governorPublicFacet).getGovernedContract();
 
-  /** @type { GovernedPublicFacet<XYKAMMPublicFacet> } */
-    // @ts-expect-error cast from unknown
-  const ammPublicFacet = await E(governorCreatorFacet).getPublicFacet();
   const amm = {
-    ammCreatorFacet: await consume.ammCreatorFacet,
+    ammCreatorFacet,
     ammPublicFacet,
     instance: governedInstance,
   };