fix: add tests

packages/boot/test/bootstrapTests/ibcClientMock.js

@@ -6,14 +6,15 @@ import { V as E } from '@agoric/vat-data/vow.js';
 /**
  * @param {ZCF} zcf
  * @param {{
- *   address: string,
  *   networkVat: ERef<ReturnType<typeof import('@agoric/vats/src/vat-network').buildRootObject>>;
  * }} privateArgs
  * @param {import("@agoric/vat-data").Baggage} _baggage
  */
 export const start = async (zcf, privateArgs, _baggage) => {
-  const { address, networkVat } = privateArgs;
-  const myPort = await E(networkVat).bindPort(address);
+  const { networkVat } = privateArgs;
+
+  const portAllocator = await E(networkVat).getPortAllocator();
+  const myPort = E(portAllocator).allocateIBCPort();
 
   const { log } = console;
   let connP;

packages/boot/test/bootstrapTests/ibcServerMock.js

@@ -17,9 +17,10 @@ const { log } = console;
  * @param {import("@agoric/vat-data").Baggage} _baggage
  */
 export const start = async (zcf, privateArgs, _baggage) => {
-  const { address, networkVat } = privateArgs;
+  const { networkVat } = privateArgs;
 
-  const boundPort = await E(networkVat).bindPort(address);
+  const portAllocator = await E(networkVat).getPortAllocator();
+  const boundPort = E(portAllocator).allocateIBCPort();
 
   /** @type {Array<[label: string, resolve: (value: any) => void, reject: (reason: any) => void]>} */
   const queue = [];

packages/boot/test/bootstrapTests/test-net-ibc-upgrade.ts

@@ -122,7 +122,7 @@ test.serial('upgrade at many points in network API flow', async t => {
         installation.ibcServerMock,
         {},
         {},
-        { address: '/ibc-port/', networkVat },
+        { networkVat },
       );
       t.truthy(started.creatorFacet, `${label} ibcServerMock`);
       return [label, { server: started.creatorFacet }];
@@ -140,7 +140,7 @@ test.serial('upgrade at many points in network API flow', async t => {
         installation.ibcClientMock,
         {},
         {},
-        { address: '/ibc-port/', networkVat },
+        { networkVat },
       );
       t.truthy(started.creatorFacet, `${label} ibcClientMock`);
       return [label, { ...opts, client: started.creatorFacet }];

packages/inter-protocol/test/smartWallet/boot-test-utils.js

@@ -58,7 +58,6 @@ export const makeMock = log =>
 
       network: Far('network', {
         registerProtocolHandler: noop,
-        bindPort: () => harden({ addListener: noop }),
       }),
     },
   });

packages/network/src/network.js

@@ -1455,6 +1455,11 @@ export const preparePortAllocator = (zone, { watch }) => {
           ),
         );
       },
+      allocateIBCPegasusPort() {
+        const { state } = this;
+        // Allocate an IBC port with a unique generated name.
+        return watch(E(state.protocol).bindPort(`/ibc-port/pegasus`));
+      },
     },
   );
 

packages/orchestration/src/orchestration.js

@@ -209,11 +209,8 @@ const prepareOrchestration = (zone, createChainAccount) =>
       self: {
         async bindPort() {
           const network = getPower(this.state.powers, 'network');
-          const port = await E(network).bindPort(
-            `/ibc-port/icacontroller-${this.state.icaControllerNonce}`,
-          );
-          this.state.icaControllerNonce += 1;
-          return port;
+          const portAllocator = await E(network).getPortAllocator();
+          return E(portAllocator).allocateICAControllerPort();
         },
       },
       public: {

packages/orchestration/src/proposals/orchestration-proposal.js

@@ -48,9 +48,8 @@ export const setupOrchestrationVat = async (
   await networkVat;
   /** @type {AttenuatedNetwork} */
   const network = Far('Attenuated Network', {
-    /** @param {string} localAddr */
-    async bindPort(localAddr) {
-      return E(networkVat).bindPort(localAddr);
+    async getPortAllocator() {
+      return E(networkVat).getPortAllocator();
     },
   });
 

packages/vats/src/proposals/network-proposal.js

@@ -77,7 +77,7 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => {
  *
  * @param {BootstrapPowers & {
  *   consume: { loadCriticalVat: VatLoader<any> };
- *   produce: { networkVat: Producer<any> };
+ *   produce: { portAllocator: Producer<any> };
  * }} powers
  * @param {object} options
  * @param {{ networkRef: VatSourceRef; ibcRef: VatSourceRef }} options.options
@@ -100,7 +100,7 @@ export const setupNetworkProtocols = async (
       provisioning,
       vatUpgradeInfo: vatUpgradeInfoP,
     },
-    produce: { networkVat, vatUpgradeInfo: produceVatUpgradeInfo },
+    produce: { portAllocator, vatUpgradeInfo: produceVatUpgradeInfo },
   },
   options,
 ) => {
@@ -121,9 +121,11 @@ export const setupNetworkProtocols = async (
   info.init('ibc', ibcRef);
   info.init('network', networkRef);
 
-  networkVat.reset();
-  networkVat.resolve(vats.network);
-  const portAllocator = E(vats.network).getPortAllocator();
+  const allocator = E(vats.network).getPortAllocator();
+
+  portAllocator.reset();
+  portAllocator.resolve(allocator);
+
   const bridgeManager = await bridgeManagerP;
   const dibcBridgeManager =
     bridgeManager && E(bridgeManager).register(BRIDGE_ID.DIBC);
@@ -136,10 +138,10 @@ export const setupNetworkProtocols = async (
     const ibcportP = [];
     for (let i = 0; i < NUM_IBC_PORTS_PER_CLIENT; i += 1) {
       if (i === NUM_IBC_PORTS_PER_CLIENT - 1) {
-        const portP = when(E(portAllocator).allocateICAControllerPort());
+        const portP = when(E(allocator).allocateICAControllerPort());
         ibcportP.push(portP);
       } else {
-        const portP = when(E(portAllocator).allocateIBCPort());
+        const portP = when(E(allocator).allocateIBCPort());
         ibcportP.push(portP);
       }
     }
@@ -152,7 +154,7 @@ export const setupNetworkProtocols = async (
   await registerNetworkProtocols(vats, dibcBridgeManager);
 
   // Add an echo listener on our ibc-port network (whether real or virtual).
-  const echoPort = await when(E(vats.network).bindPort('/ibc-port/echo'));
+  const echoPort = await when(E(allocator).allocateICAControllerPort());
   const { listener } = await E(vats.network).makeEchoConnectionKit();
   await when(E(echoPort).addListener(listener));
   return E(client).assignBundle([_a => ({ ibcport: makePorts() })]);
@@ -168,10 +170,8 @@ export const getManifestForNetwork = (_powers, { networkRef, ibcRef }) => ({
         zoe: 'zoe',
         provisioning: 'provisioning',
         vatUpgradeInfo: true,
-        portAllocator: 'portAllocator',
       },
       produce: {
-        networkVat: 'network',
         vatUpgradeInfo: true,
       },
       zone: true,

packages/vats/src/vat-network.js

@@ -41,8 +41,6 @@ export function buildRootObject(_vatPowers, _args, baggage) {
     /** @param {Parameters<typeof protocol.unregisterProtocolHandler>} args */
     unregisterProtocolHandler: (...args) =>
       protocol.unregisterProtocolHandler(...args),
-    /** @param {Parameters<typeof protocol.bindPort>} args */
-    bindPort: (...args) => protocol.bindPort(...args),
     getPortAllocator() {
       return portAllocator;
     },