Merge branch 'master' into cth-auction-priceNotifier

Agoric · Dec 4, 2024 · 466d3b8 · 466d3b8
2 parents e88aebe + 8b9c8db
commit 466d3b8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/packages/boot/package.json b/packages/boot/package.json
@@ -9,7 +9,7 @@
     "build": "exit 0",
     "clean": "rm -rf bundles/config.*",
     "test": "ava",
-    "test:xs": "SWINGSET_WORKER_TYPE=xs-worker ava test/bootstrapTests test/upgrading",
+    "test:xs": "SWINGSET_WORKER_TYPE=xs-worker ava test/bootstrapTests test/upgrading test/fast-usdc",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:types": "tsc",

diff --git a/packages/boot/test/fast-usdc/fast-usdc.test.ts b/packages/boot/test/fast-usdc/fast-usdc.test.ts
@@ -1,8 +1,6 @@
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import type { TestFn } from 'ava';
-import type { FastUSDCKit } from '@agoric/fast-usdc/src/fast-usdc.start.js';
-import type { CctpTxEvidence } from '@agoric/fast-usdc/src/types.js';
 import { MockCctpTxEvidences } from '@agoric/fast-usdc/test/fixtures.js';
 import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
 import { Fail } from '@endo/errors';
@@ -14,12 +12,34 @@ import {
   makeWalletFactoryContext,
   type WalletFactoryTestContext,
 } from '../bootstrapTests/walletFactory.js';
+import {
+  makeSwingsetHarness,
+  insistManagerType,
+} from '../../tools/supports.js';
+
+const test: TestFn<
+  WalletFactoryTestContext & {
+    harness?: ReturnType<typeof makeSwingsetHarness>;
+  }
+> = anyTest;
 
-const test: TestFn<WalletFactoryTestContext> = anyTest;
+const {
+  SLOGFILE: slogFile,
+  SWINGSET_WORKER_TYPE: defaultManagerType = 'local',
+} = process.env;
 
 test.before('bootstrap', async t => {
   const config = '@agoric/vm-config/decentral-itest-orchestration-config.json';
-  t.context = await makeWalletFactoryContext(t, config);
+  insistManagerType(defaultManagerType);
+  const harness = ['xs-worker', 'xsnap'].includes(defaultManagerType)
+    ? makeSwingsetHarness()
+    : undefined;
+  const ctx = await makeWalletFactoryContext(t, config, {
+    slogFile,
+    defaultManagerType,
+    harness,
+  });
+  t.context = { ...ctx, harness };
 });
 test.after.always(t => t.context.shutdown?.());
 
@@ -129,7 +149,12 @@ test.serial('writes fee config to vstorage', async t => {
 });
 
 test.serial('makes usdc advance', async t => {
-  const { walletFactoryDriver: wd, storage, agoricNamesRemotes } = t.context;
+  const {
+    walletFactoryDriver: wd,
+    storage,
+    agoricNamesRemotes,
+    harness,
+  } = t.context;
   const oracles = await Promise.all([
     wd.provideSmartWallet('agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8'),
     wd.provideSmartWallet('agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr'),
@@ -167,7 +192,8 @@ test.serial('makes usdc advance', async t => {
   await eventLoopIteration();
 
   const evidence = MockCctpTxEvidences.AGORIC_PLUS_OSMO();
-  // TODO - start counting computrons
+
+  harness?.useRunPolicy(true);
   await Promise.all(
     oracles.map(wallet =>
       wallet.sendOffer({
@@ -183,7 +209,12 @@ test.serial('makes usdc advance', async t => {
     ),
   );
   await eventLoopIteration();
-  // TODO - stop counting computrons
+  harness &&
+    t.log(
+      `fusdc advance computrons (${oracles.length} oracles)`,
+      harness.totalComputronCount(),
+    );
+  harness?.resetRunPolicy();
 
   const doc = {
     node: `fastUsdc.status`,