refactor: OrchestrationService in service.js

Agoric · Apr 24, 2024 · 54d18d9 · 54d18d9
1 parent 7bd1978
commit 54d18d9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/packages/boot/test/bootstrapTests/test-vat-orchestration.ts b/packages/boot/test/bootstrapTests/test-vat-orchestration.ts
@@ -7,7 +7,7 @@ import {
   MsgDelegateResponse,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
 import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
-import type { ChainAccount, Orchestration } from '@agoric/orchestration';
+import type { ChainAccount, OrchestrationService } from '@agoric/orchestration';
 import { decodeBase64 } from '@endo/base64';
 import { M, matches } from '@endo/patterns';
 import { makeWalletFactoryContext } from './walletFactory.ts';
@@ -100,7 +100,7 @@ test('ICA connection can be closed', async t => {
     runUtils: { EV },
   } = t.context;
 
-  const orchestration: Orchestration =
+  const orchestration: OrchestrationService =
     await EV.vat('bootstrap').consumeItem('orchestration');
 
   const account = await EV(orchestration).createAccount(

diff --git a/packages/orchestration/index.js b/packages/orchestration/index.js
@@ -2,4 +2,4 @@
 export * from './src/types.js';
 export * from './src/utils/address.js';
 export * from './src/utils/tx.js';
-export * from './src/orchestration.js';
+export * from './src/service.js';
diff --git a/packages/orchestration/src/contracts/stakeAtom.contract.js b/packages/orchestration/src/contracts/stakeAtom.contract.js
@@ -11,7 +11,7 @@ import { prepareStakingAccountHolder } from './stakingAccountHolder.js';
 
 const trace = makeTracer('StakeAtom');
 /**
- * @import { Orchestration } from '../types.js';
+ * @import { OrchestrationService } from '../service.js'
  * @import { Baggage } from '@agoric/vat-data';
  * @import { IBCConnectionID } from '@agoric/vats';
  */
@@ -27,7 +27,7 @@ const trace = makeTracer('StakeAtom');
  *
  * @param {ZCF<StakeAtomTerms>} zcf
  * @param {{
- *  orchestration: Orchestration;
+ *  orchestration: OrchestrationService;
  *  storageNode: StorageNode;
  *  marshaller: Marshaller;
  * }} privateArgs

diff --git a/packages/orchestration/src/proposals/orchestration-proposal.js b/packages/orchestration/src/proposals/orchestration-proposal.js
@@ -2,7 +2,11 @@
 import { V as E } from '@agoric/vat-data/vow.js';
 import { Far } from '@endo/far';
 
-/** @import { AttenuatedNetwork, Orchestration, OrchestrationVat } from '../types' */
+/**
+ * @import { AttenuatedNetwork } from '../types'
+ * @import { OrchestrationService } from '../service.js'
+ * @import { OrchestrationVat } from '../vat-orchestration.js'
+ */
 
 /**
  * @param {BootstrapPowers & {
@@ -67,7 +71,7 @@ export const setupOrchestrationVat = async (
 /**
  * @param {BootstrapPowers & {
  *   consume: {
- *     orchestration: Orchestration;
+ *     orchestration: OrchestrationService;
  *   };
  * }} powers
  * @param {object} _options

diff --git a/packages/orchestration/src/orchestration.js → packages/orchestration/src/service.js b/packages/orchestration/src/orchestration.js → packages/orchestration/src/service.js
@@ -2,11 +2,11 @@
 /** @file Orchestration service */
 import { NonNullish } from '@agoric/assert';
 import { makeTracer } from '@agoric/internal';
+import '@agoric/network/exported.js';
 import { V as E } from '@agoric/vat-data/vow.js';
 import { M } from '@endo/patterns';
 import { makeICAConnectionAddress, parseAddress } from './utils/address.js';
 import { makeTxPacket, parsePacketAck } from './utils/tx.js';
-import '@agoric/network/exported.js';
 
 /**
  * @import { AttenuatedNetwork } from './types.js';
@@ -256,4 +256,4 @@ harden(prepareOrchestrationTools);
 /** @typedef {ChainAccountKit['account']} ChainAccount */
 /** @typedef {ReturnType<typeof prepareOrchestrationTools>} OrchestrationTools */
 /** @typedef {ReturnType<OrchestrationTools['makeOrchestration']>} OrchestrationKit */
-/** @typedef {OrchestrationKit['public']} Orchestration */
+/** @typedef {OrchestrationKit['public']} OrchestrationService */
diff --git a/packages/orchestration/src/vat-orchestration.js b/packages/orchestration/src/vat-orchestration.js
@@ -1,9 +1,9 @@
 // @ts-check
 import { Far } from '@endo/far';
 import { makeDurableZone } from '@agoric/zone/durable.js';
-import { prepareOrchestrationTools } from './orchestration.js';
+import { prepareOrchestrationTools } from './service.js';
 
-/** @import { OrchestrationPowers } from './types.js' */
+/** @import { OrchestrationPowers } from './service.js' */
 
 export const buildRootObject = (_vatPowers, _args, baggage) => {
   const zone = makeDurableZone(baggage);

diff --git a/packages/vats/src/core/types-ambient.d.ts b/packages/vats/src/core/types-ambient.d.ts
@@ -348,7 +348,7 @@ type ChainBootstrapSpaceT = {
   namesByAddress: import('../types.js').NameHub;
   namesByAddressAdmin: import('../types.js').NamesByAddressAdmin;
   networkVat: NetworkVat;
-  orchestration: import('@agoric/orchestration/src/orchestration.js').Orchestration;
+  orchestration: import('@agoric/orchestration/src/service.js').OrchestrationService;
   pegasusConnections: import('@agoric/vats').NameHubKit;
   pegasusConnectionsAdmin: import('@agoric/vats').NameAdmin;
   priceAuthorityVat: Awaited<PriceAuthorityVat>;