refactor: PR feedback

Agoric · Apr 26, 2024 · 96b8508 · 96b8508
1 parent fce3edb
commit 96b8508
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/packages/network/src/types.js b/packages/network/src/types.js
@@ -189,4 +189,4 @@
  *   Create an outbound connection
  */
 
-/** @typedef {ReturnType<ReturnType<typeof preparePortAllocator>>} PortAllocator */
+/** @typedef {ReturnType<ReturnType<typeof import('@agoric/network').preparePortAllocator>>} PortAllocator */
diff --git a/packages/network/test/test-network-misc.js b/packages/network/test/test-network-misc.js
@@ -54,7 +54,7 @@ const prepareProtocolHandler = (
       },
       async generatePortID() {
         this.state.nonce += 1;
-        return `${this.state.nonce}`;
+        return `port-${this.state.nonce}`;
       },
       async onBind(port, localAddr) {
         t.assert(port, `port is supplied to onBind`);
@@ -187,7 +187,7 @@ test('verify port allocation', async t => {
   const portAllocator = makePortAllocator({ protocol });
 
   const ibcPort = await when(portAllocator.allocateIBCPort());
-  t.is(ibcPort.getLocalAddress(), '/ibc-port/1');
+  t.is(ibcPort.getLocalAddress(), '/ibc-port/port-1');
 
   const icaControllerPort1 = await when(
     portAllocator.allocateICAControllerPort(),

diff --git a/packages/orchestration/src/proposals/orchestration-proposal.js b/packages/orchestration/src/proposals/orchestration-proposal.js
@@ -1,9 +1,7 @@
 // @ts-check
 import { V as E } from '@agoric/vat-data/vow.js';
-import { Far } from '@endo/far';
 
 /**
- * @import { AttenuatedPortAllocator } from '../types'
  * @import { OrchestrationService } from '../service.js'
  * @import { OrchestrationVat } from '../vat-orchestration.js'
  */
@@ -12,7 +10,7 @@ import { Far } from '@endo/far';
  * @param {BootstrapPowers & {
  *   consume: {
  *     loadCriticalVat: VatLoader<any>;
- *     portAllocator: AttenuatedPortAllocator;
+ *     portAllocator: PortAllocator;
  *   };
  *   produce: {
  *     orchestration: Producer<any>;
@@ -29,7 +27,7 @@ import { Far } from '@endo/far';
  */
 export const setupOrchestrationVat = async (
   {
-    consume: { loadCriticalVat, portAllocator },
+    consume: { loadCriticalVat, portAllocator: portAllocatorP },
     produce: {
       orchestrationVat,
       orchestration,
@@ -49,17 +47,10 @@ export const setupOrchestrationVat = async (
   orchestrationVat.reset();
   orchestrationVat.resolve(vats.orchestration);
 
-  await portAllocator;
-
-  /** @type {AttenuatedPortAllocator} */
-  const allocator = Far('PortAllocator', {
-    async allocateICAControllerPort() {
-      return E(portAllocator).allocateICAControllerPort();
-    },
-  });
+  const portAllocator = await portAllocatorP;
 
   const newOrchestrationKit = await E(vats.orchestration).makeOrchestration({
-    portAllocator: allocator,
+    portAllocator,
   });
 
   orchestration.reset();

diff --git a/packages/orchestration/src/service.js b/packages/orchestration/src/service.js
@@ -11,10 +11,11 @@ import { makeICAConnectionAddress, parseAddress } from './utils/address.js';
 import { makeTxPacket, parsePacketAck } from './utils/tx.js';
 
 /**
- * @import { AttenuatedPortAllocator, ChainAccount, ChainAddress } from './types.js';
+ * @import { ChainAccount, ChainAddress } from './types.js';
  * @import { IBCConnectionID } from '@agoric/vats';
  * @import { Zone } from '@agoric/base-zone';
  * @import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
+ *
  */
 
 const { Fail, bare } = assert;
@@ -24,7 +25,7 @@ const trace = makeTracer('Orchestration');
 
 /**
  * @typedef {object} OrchestrationPowers
- * @property {ERef<AttenuatedPortAllocator>} portAllocator
+ * @property {ERef<PortAllocator>} portAllocator
  */
 
 /**

diff --git a/packages/orchestration/src/types.d.ts b/packages/orchestration/src/types.d.ts
@@ -12,12 +12,6 @@ import type {
   Redelegation,
   UnbondingDelegation,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
-import type { PortAllocator } from '@agoric/network/src/network';
-
-export type AttenuatedPortAllocator = Pick<
-  PortAllocator,
-  'allocateICAControllerPort'
->;
 
 /**
  * static declaration of known chain types will allow type support for