refactor: integrate with #5397

update interchainPool tests

switch minInitialPoolLiquidity back to Nat in startupAmm since it has
to be driven from text values in environment variables.

packages/run-protocol/src/interchainPool.js

@@ -79,7 +79,7 @@ export const start = (zcf, { bankManager }) => {
       } = seat2.getProposal();
       AmountMath.coerce(interAsset.brand, secondaryAmt);
 
-      const liquidityIssuer = await E(ammPub).addPool(
+      const liquidityIssuer = await E(ammPub).addIssuer(
         interAsset.issuer,
         `Interchain${kwNonce}`,
       );
@@ -95,7 +95,7 @@ export const start = (zcf, { bankManager }) => {
       seat2.incrementBy(seat.decrementBy(harden({ Central: centralAmt })));
       zcf.reallocate(seat, seat2);
 
-      const invitation = await E(ammPub).makeAddLiquidityInvitation();
+      const invitation = await E(ammPub).addPoolInvitation();
       const { userSeatPromise, deposited } = await offerTo(
         zcf,
         invitation,

packages/run-protocol/src/proposals/econ-behaviors.js

@@ -191,16 +191,14 @@ export const setupAmm = async (
     E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
     runBrandP,
   ]);
-  const {
-    minInitialPoolLiquidity = AmountMath.make(runBrand, 1_000_000_000n),
-  } = opts;
+  const { minInitialPoolLiquidity = 1_000_000_000n } = opts;
 
   const timer = await chainTimerService; // avoid promise for legibility
 
   const ammTerms = makeAmmTerms(
     timer,
     poserInvitationAmount,
-    minInitialPoolLiquidity,
+    AmountMath.make(runBrand, minInitialPoolLiquidity),
   );
 
   const ammGovernorTerms = {

packages/run-protocol/test/amm/vpool-xyk-amm/setup.js

@@ -94,7 +94,7 @@ export const setupAmmServices = async (
       options: { econCommitteeOptions: electorateTerms },
     }),
     setupAmm(space, {
-      minInitialPoolLiquidity: AmountMath.make(centralR.brand, 1000n),
+      minInitialPoolLiquidity: 1000n,
     }),
   ]);
 

packages/run-protocol/test/test-gov-collateral.js

@@ -314,7 +314,7 @@ const makeScenario = async t => {
     } = home;
 
     return harden({
-      makePool: async (atomQty = 100n, istQty = 500n) => {
+      makePool: async (atomQty = 500n, istQty = 1000n) => {
         const istBrand = await E(agoricNames).lookup('brand', 'RUN');
         const istAmt = qty => AmountMath.make(istBrand, qty * 1_000_000n);
         const interchainPoolAPI = E(zoe).getPublicFacet(
@@ -411,7 +411,7 @@ test('Benefactor can add to reserve', async t => {
   await s.startDevNet();
   await s.provisionMembers();
   await s.startRunPreview();
-  await s.benefactor.makePool(2000n, 100n);
+  await s.benefactor.makePool(2000n, 1000n);
   await Promise.all([
     s.enactVaultAssetProposal(),
     s.enactInviteEconCommitteeProposal(),
@@ -458,7 +458,7 @@ test('assets are in AMM, Vaults', async t => {
   await s.startDevNet();
   await s.provisionMembers();
   await s.startRunPreview();
-  await s.benefactor.makePool(2000n, 100n);
+  await s.benefactor.makePool(2000n, 1000n);
 
   await Promise.all([
     s.enactVaultAssetProposal(),
@@ -494,7 +494,7 @@ test('Committee can raise debt limit', async t => {
   await s.startDevNet();
   const purses = await s.provisionMembers();
   await s.startRunPreview();
-  await s.benefactor.makePool(2000n, 100n);
+  await s.benefactor.makePool(2000n, 1000n);
 
   await Promise.all([
     s.enactVaultAssetProposal(),

packages/run-protocol/test/test-interchainPool.js

@@ -49,7 +49,7 @@ test('make interchain pool', async t => {
   const { make, add } = AmountMath;
   const { zoe, istKit, installation } = t.context;
 
-  const minimumCentral = make(istKit.brand, 100n * 1_000_000n);
+  const minimumCentral = make(istKit.brand, 1000n * 1_000_000n);
 
   // Start AMM
   const {
@@ -108,7 +108,7 @@ test('make interchain pool', async t => {
       const pmt = await actualPayouts[kw];
       // eslint-disable-next-line no-await-in-loop
       const actual = await E(issuers[kw]).getAmountOf(pmt);
-      t.deepEqual(actual, amts[kw]);
+      t.deepEqual(actual, amts[kw], `amount mismatch for ${kw}`);
     }
   };
 
@@ -156,7 +156,8 @@ test('make interchain pool', async t => {
       {
         Central: make(istKit.brand, 0n),
         Secondary: make(ibcBrand, 0n),
-        Liquidity: make(liqBrand, proposal1.give.Central.value),
+        // @ts-expect-error proposal1.give.Central.value is Nat
+        Liquidity: make(liqBrand, proposal1.give.Central.value - 1000n),
       },
       {
         Central: istKit.issuer,

packages/run-protocol/test/vaultFactory/test-liquidator.js

@@ -140,7 +140,7 @@ const setupAmmAndElectorate = async (t, aethLiquidity, runLiquidity) => {
     options: { econCommitteeOptions: electorateTerms },
   });
   setupAmm(space, {
-    minInitialPoolLiquidity: AmountMath.make(runBrand, 1000n),
+    minInitialPoolLiquidity: 1000n,
   });
 
   const governorCreatorFacet = consume.ammGovernorCreatorFacet;

packages/run-protocol/test/vaultFactory/test-vaultFactory.js

@@ -137,7 +137,6 @@ const setupAmmAndElectorate = async (t, aethLiquidity, runLiquidity) => {
   const {
     zoe,
     aethKit: { issuer: aethIssuer },
-    runKit: { brand: runBrand },
     electorateTerms = { committeeName: 'The Cabal', committeeSize: 1 },
     timer,
   } = t.context;
@@ -148,7 +147,7 @@ const setupAmmAndElectorate = async (t, aethLiquidity, runLiquidity) => {
   space.installation.produce.amm.resolve(t.context.installation.amm);
   await startEconomicCommittee(space, electorateTerms);
   await setupAmm(space, {
-    minInitialPoolLiquidity: AmountMath.make(runBrand, 300n),
+    minInitialPoolLiquidity: 300n,
   });
 
   const governorCreatorFacet = consume.ammGovernorCreatorFacet;