test: match cosmosInterchainService bootstrap

Agoric · Jul 9, 2024 · 1c1560a · 1c1560a
1 parent c2f422f
commit 1c1560a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/packages/orchestration/test/examples/stake-ica.contract.test.ts b/packages/orchestration/test/examples/stake-ica.contract.test.ts
@@ -51,7 +51,7 @@ const getChainTerms = (
 };
 
 const startContract = async ({
-  orchestration,
+  cosmosInterchainService,
   timer,
   marshaller,
   storage,
@@ -69,7 +69,7 @@ const startContract = async ({
     terms,
     {
       marshaller,
-      cosmosInterchainService: orchestration,
+      cosmosInterchainService,
       storageNode: storage.rootNode.makeChildNode(storagePath),
       timer,
     },

diff --git a/packages/orchestration/test/service.test.ts b/packages/orchestration/test/service.test.ts
@@ -18,12 +18,12 @@ import { tryDecodeResponse } from '../src/utils/cosmos.js';
 
 test('makeICQConnection returns an ICQConnection', async t => {
   const {
-    bootstrap: { orchestration },
+    bootstrap: { cosmosInterchainService },
   } = await commonSetup(t);
 
   const CONTROLLER_CONNECTION_ID = 'connection-0';
 
-  const icqConnection = await E(orchestration).provideICQConnection(
+  const icqConnection = await E(cosmosInterchainService).provideICQConnection(
     CONTROLLER_CONNECTION_ID,
   );
   const [localAddr, remoteAddr] = await Promise.all([
@@ -46,7 +46,7 @@ test('makeICQConnection returns an ICQConnection', async t => {
     'remote address contains icqhost port, unordered ordering, and icq-1 version string',
   );
 
-  const icqConnection2 = await E(orchestration).provideICQConnection(
+  const icqConnection2 = await E(cosmosInterchainService).provideICQConnection(
     CONTROLLER_CONNECTION_ID,
   );
   const localAddr2 = await E(icqConnection2).getLocalAddress();
@@ -68,14 +68,14 @@ test('makeICQConnection returns an ICQConnection', async t => {
 
 test('makeAccount returns a ChainAccount', async t => {
   const {
-    bootstrap: { orchestration },
+    bootstrap: { cosmosInterchainService },
   } = await commonSetup(t);
 
   const CHAIN_ID = 'cosmoshub-99';
   const HOST_CONNECTION_ID = 'connection-0';
   const CONTROLLER_CONNECTION_ID = 'connection-1';
 
-  const account = await E(orchestration).makeAccount(
+  const account = await E(cosmosInterchainService).makeAccount(
     CHAIN_ID,
     HOST_CONNECTION_ID,
     CONTROLLER_CONNECTION_ID,

diff --git a/packages/orchestration/test/supports.ts b/packages/orchestration/test/supports.ts
@@ -113,11 +113,13 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
   );
   await setupIBCProtocol();
 
-  const makeOrchestrationKit = prepareCosmosInterchainService(
+  const makeCosmosInterchainService = prepareCosmosInterchainService(
     rootZone.subZone('orchestration'),
     vowTools,
   );
-  const orchestration = makeOrchestrationKit({ portAllocator });
+  const cosmosInterchainService = makeCosmosInterchainService({
+    portAllocator,
+  });
 
   await registerChainNamespace(agoricNamesAdmin, () => {});
 
@@ -129,7 +131,7 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
       timer,
       localchain,
       marshaller,
-      orchestration,
+      cosmosInterchainService,
       // TODO remove; bootstrap doesn't have a zone
       rootZone: rootZone.subZone('contract'),
       storage,
@@ -143,15 +145,15 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
     commonPrivateArgs: {
       agoricNames,
       localchain,
-      orchestrationService: orchestration,
+      orchestrationService: cosmosInterchainService,
       storageNode: storage.rootNode,
       marshaller,
       timerService: timer,
     },
     facadeServices: {
       agoricNames,
       localchain,
-      orchestrationService: orchestration,
+      orchestrationService: cosmosInterchainService,
       timerService: timer,
     },
     utils: {