test: add concurrent liquidation tests

Agoric · Oct 5, 2023 · 9af1e08 · 9af1e08
1 parent da3b8a8
commit 9af1e08
Show file tree

Hide file tree

Showing 5 changed files with 1,087 additions and 31 deletions.
diff --git a/packages/boot/test/bootstrapTests/liquidation.ts b/packages/boot/test/bootstrapTests/liquidation.ts
@@ -85,9 +85,11 @@ export const makeLiquidationTestContext = async t => {
   const setupStartingState = async ({
     collateralBrandKey,
     managerIndex,
+    price,
   }: {
     collateralBrandKey: string;
     managerIndex: number;
+    price: number;
   }) => {
     const managerPath = `published.vaultFactory.managers.manager${managerIndex}`;
     const { advanceTimeBy, readLatest } = swingsetTestKit;
@@ -111,7 +113,7 @@ export const makeLiquidationTestContext = async t => {
     // price feed logic treats zero time as "unset" so advance to nonzero
     await advanceTimeBy(1, 'seconds');
 
-    await priceFeedDrivers[collateralBrandKey].setPrice(12.34);
+    await priceFeedDrivers[collateralBrandKey].setPrice(price);
 
     // raise the VaultFactory DebtLimit
     await governanceDriver.changeParams(
@@ -217,6 +219,39 @@ export const makeLiquidationTestContext = async t => {
   };
 };
 
+export const addSTARsCollateral = async t => {
+  const { controller, buildProposal } = t.context;
+
+  t.log('building proposal');
+  const proposal = await buildProposal({
+    package: 'builders',
+    packageScriptName: 'build:add-STARS-proposal',
+  });
+
+  for await (const bundle of proposal.bundles) {
+    await controller.validateAndInstallBundle(bundle);
+  }
+  t.log('installed', proposal.bundles.length, 'bundles');
+
+  t.log('launching proposal');
+  const bridgeMessage = {
+    type: 'CORE_EVAL',
+    evals: proposal.evals,
+  };
+  t.log({ bridgeMessage });
+
+  const { EV } = t.context.runUtils;
+  /** @type {ERef<import('@agoric/vats/src/types.js').BridgeHandler>} */
+  const coreEvalBridgeHandler = await EV.vat('bootstrap').consumeItem(
+    'coreEvalBridgeHandler',
+  );
+  await EV(coreEvalBridgeHandler).fromBridge(bridgeMessage);
+
+  t.context.refreshAgoricNamesRemotes();
+
+  t.log('add-STARS proposal executed');
+};
+
 export type LiquidationTestContext = Awaited<
   ReturnType<typeof makeLiquidationTestContext>
 >;
diff --git a/packages/boot/test/bootstrapTests/test-liquidation-1.ts b/packages/boot/test/bootstrapTests/test-liquidation-1.ts
@@ -8,6 +8,7 @@ import type { ExecutionContext, TestFn } from 'ava';
 import type { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
 import { BridgeHandler } from '@agoric/vats';
 import {
+  addSTARsCollateral,
   LiquidationTestContext,
   likePayouts,
   makeLiquidationTestContext,
@@ -152,6 +153,7 @@ const checkFlow1 = async (
   await setupStartingState({
     collateralBrandKey,
     managerIndex,
+    price: setup.price.starting,
   });
 
   const minter = await walletFactoryDriver.provideSmartWallet('agoric1minter');
@@ -389,35 +391,7 @@ test.serial(
 );
 
 test.serial('add STARS collateral', async t => {
-  const { controller, buildProposal } = t.context;
-
-  t.log('building proposal');
-  const proposal = await buildProposal({
-    package: 'builders',
-    packageScriptName: 'build:add-STARS-proposal',
-  });
-
-  for await (const bundle of proposal.bundles) {
-    await controller.validateAndInstallBundle(bundle);
-  }
-  t.log('installed', proposal.bundles.length, 'bundles');
-
-  t.log('launching proposal');
-  const bridgeMessage = {
-    type: 'CORE_EVAL',
-    evals: proposal.evals,
-  };
-  t.log({ bridgeMessage });
-
-  const { EV } = t.context.runUtils;
-  const coreEvalBridgeHandler: ERef<BridgeHandler> = await EV.vat(
-    'bootstrap',
-  ).consumeItem('coreEvalBridgeHandler');
-  await EV(coreEvalBridgeHandler).fromBridge(bridgeMessage);
-
-  t.context.refreshAgoricNamesRemotes();
-
-  t.log('add-STARS proposal executed');
+  await addSTARsCollateral(t);
   t.pass(); // reached here without throws
 });
 

diff --git a/packages/boot/test/bootstrapTests/test-liquidation-2b.ts b/packages/boot/test/bootstrapTests/test-liquidation-2b.ts
@@ -133,7 +133,11 @@ test.serial('scenario: Flow 2b', async t => {
     walletFactoryDriver,
   } = t.context;
 
-  await setupStartingState({ collateralBrandKey: 'ATOM', managerIndex: 0 });
+  await setupStartingState({
+    collateralBrandKey: 'ATOM',
+    managerIndex: 0,
+    price: setup.price.starting,
+  });
 
   const minter = await walletFactoryDriver.provideSmartWallet('agoric1minter');