test: make fake bootstrap more credible

Agoric · Jan 29, 2025 · 947cca2 · 947cca2
1 parent 570031f
commit 947cca2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/packages/fast-usdc/test/exos/advancer.test.ts b/packages/fast-usdc/test/exos/advancer.test.ts
@@ -48,10 +48,10 @@ type CommonSetup = Awaited<ReturnType<typeof commonSetup>>;
 
 const createTestExtensions = (t, common: CommonSetup) => {
   const {
-    bootstrap: { rootZone, vowTools },
     facadeServices: { chainHub },
     brands: { usdc },
     commonPrivateArgs: { storageNode },
+    utils: { contractZone, vowTools },
   } = common;
 
   const { log, inspectLogs } = makeTestLogger(t.log);
@@ -61,16 +61,19 @@ const createTestExtensions = (t, common: CommonSetup) => {
   chainHub.registerChain('osmosis', fetchedChainInfo.osmosis);
 
   const statusManager = prepareStatusManager(
-    rootZone.subZone('status-manager'),
+    contractZone.subZone('status-manager'),
     storageNode.makeChildNode('txns'),
     { marshaller: common.commonPrivateArgs.marshaller },
   );
 
-  const mockAccounts = prepareMockOrchAccounts(rootZone.subZone('accounts'), {
-    vowTools,
-    log: t.log,
-    usdc,
-  });
+  const mockAccounts = prepareMockOrchAccounts(
+    contractZone.subZone('accounts'),
+    {
+      vowTools,
+      log: t.log,
+      usdc,
+    },
+  );
 
   const mockZCF = Far('MockZCF', {
     makeEmptySeatKit: () => ({ zcfSeat: Far('MockZCFSeat', {}) }),
@@ -94,7 +97,7 @@ const createTestExtensions = (t, common: CommonSetup) => {
   });
 
   const feeConfig = makeTestFeeConfig(usdc);
-  const makeAdvancer = prepareAdvancer(rootZone.subZone('advancer'), {
+  const makeAdvancer = prepareAdvancer(contractZone.subZone('advancer'), {
     chainHub,
     feeConfig,
     localTransfer: mockZoeTools.localTransfer,

diff --git a/packages/fast-usdc/test/exos/settler.test.ts b/packages/fast-usdc/test/exos/settler.test.ts
@@ -49,7 +49,7 @@ const mockZcf = (zone: Zone) => {
 
 const makeTestContext = async t => {
   const common = await commonSetup(t);
-  const { rootZone: zone } = common.bootstrap;
+  const { contractZone: zone } = common.utils;
   const { log, inspectLogs } = makeTestLogger(t.log);
   const statusManager = prepareStatusManager(
     zone.subZone('status-manager'),
@@ -58,9 +58,9 @@ const makeTestContext = async t => {
   );
   const { zcf, callLog } = mockZcf(zone.subZone('Mock ZCF'));
 
-  const { rootZone, vowTools } = common.bootstrap;
+  const { vowTools } = common.utils;
   const { usdc } = common.brands;
-  const mockAccounts = prepareMockOrchAccounts(rootZone.subZone('accounts'), {
+  const mockAccounts = prepareMockOrchAccounts(zone.subZone('accounts'), {
     vowTools,
     log: t.log,
     usdc,
@@ -87,7 +87,7 @@ const makeTestContext = async t => {
     zcf,
     withdrawToSeat: mockWithdrawToSeat,
     feeConfig: common.commonPrivateArgs.feeConfig,
-    vowTools: common.bootstrap.vowTools,
+    vowTools: common.utils.vowTools,
     chainHub,
     log,
   });

diff --git a/packages/fast-usdc/test/supports.ts b/packages/fast-usdc/test/supports.ts
@@ -229,11 +229,7 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
       timer,
       localchain,
       cosmosInterchainService,
-      // TODO remove; bootstrap doesn't have a zone
-      rootZone: rootZone.subZone('contract'),
       storage,
-      // TODO remove; bootstrap doesn't have vowTools
-      vowTools,
     },
     brands: {
       usdc: usdcSansMint,
@@ -263,11 +259,13 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
       timerService: timer,
     },
     utils: {
+      contractZone: rootZone.subZone('contract'),
       pourPayment,
       inspectLocalBridge: () => harden([...localBridgeMessages]),
       inspectDibcBridge: () => E(ibcBridge).inspectDibcBridge(),
       inspectBankBridge: () => harden([...bankBridgeMessages]),
       transmitTransferAck,
+      vowTools,
     },
   };
 };