fix(network): use new ERef and FarRef

Agoric · Jun 14, 2024 · 3027adf · 3027adf
1 parent 90e062c
commit 3027adf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/boot/test/bootstrapTests/ibcClientMock.js b/packages/boot/test/bootstrapTests/ibcClientMock.js
@@ -4,13 +4,14 @@ import { Far } from '@endo/far';
 import { V as E } from '@agoric/vow/vat.js';
 
 /**
- * @import {ListenHandler, PortAllocator} from '@agoric/network';
+ * @import {Connection, PortAllocator} from '@agoric/network';
+ * @import {FarRef, ERef} from '@agoric/vow';
  */
 
 /**
  * @param {ZCF} zcf
  * @param {{
- *   portAllocator: ERef<PortAllocator>;
+ *   portAllocator: FarRef<PortAllocator>;
  * }} privateArgs
  * @param {import('@agoric/vat-data').Baggage} _baggage
  */
@@ -20,7 +21,13 @@ export const start = async (zcf, privateArgs, _baggage) => {
   const myPort = await E(portAllocator).allocateCustomIBCPort();
 
   const { log } = console;
+  /**
+   * @type {FarRef<Connection>}
+   */
   let connP;
+  /**
+   * @type {ERef<string>}
+   */
   let ackP;
 
   const creatorFacet = Far('CF', {

diff --git a/packages/internal/src/types.d.ts b/packages/internal/src/types.d.ts
@@ -57,6 +57,7 @@ export type Remote<Primary, Local = DataOnly<Primary>> =
   | Primary
   | RemotableBrand<Local, Primary>;
 
+// TODO: Add type tests for FarRef and Remote.
 /**
  * Potentially remote promises or settled references.
  */

diff --git a/packages/network/src/network.js b/packages/network/src/network.js
@@ -1475,7 +1475,7 @@ export const preparePortAllocator = (zone, { watch }) =>
      */
     ({ protocol }) => ({ protocol, lastICAPortNum: 0n, lastICQPortNum: 0n }),
     {
-      allocateCustomIBCPort(specifiedName = '') {
+      async allocateCustomIBCPort(specifiedName = '') {
         const { state } = this;
         let localAddr = `/ibc-port/`;
 
@@ -1488,7 +1488,7 @@ export const preparePortAllocator = (zone, { watch }) =>
         // Allocate an IBC port with a unique generated name.
         return watch(E(state.protocol).bindPort(localAddr));
       },
-      allocateICAControllerPort() {
+      async allocateICAControllerPort() {
         const { state } = this;
         state.lastICAPortNum += 1n;
         return watch(
@@ -1497,7 +1497,7 @@ export const preparePortAllocator = (zone, { watch }) =>
           ),
         );
       },
-      allocateICQControllerPort() {
+      async allocateICQControllerPort() {
         const { state } = this;
         state.lastICQPortNum += 1n;
         return watch(
@@ -1506,7 +1506,7 @@ export const preparePortAllocator = (zone, { watch }) =>
           ),
         );
       },
-      allocateCustomLocalPort(specifiedName = '') {
+      async allocateCustomLocalPort(specifiedName = '') {
         const { state } = this;
 
         let localAddr = `/local/`;