fix(Channel): Make getOutboundRAMFAddress() return a promise (#490)

relaycorp · Jul 19, 2022 · a53ad7d · a53ad7d
1 parent cc755af
commit a53ad7d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/src/lib/nodes/channels/Channel.spec.ts b/src/lib/nodes/channels/Channel.spec.ts
@@ -165,7 +165,7 @@ describe('wrapMessagePayload', () => {
 });
 
 class StubChannel extends Channel {
-  getOutboundRAMFAddress(): string {
+  async getOutboundRAMFAddress(): Promise<string> {
     throw new Error('not implemented');
   }
 }
diff --git a/src/lib/nodes/channels/Channel.ts b/src/lib/nodes/channels/Channel.ts
@@ -45,7 +45,7 @@ export abstract class Channel {
     return envelopedData.serialize();
   }
 
-  public abstract getOutboundRAMFAddress(): string;
+  public abstract getOutboundRAMFAddress(): Promise<string>;
 
   protected async getNodePrivateAddress(): Promise<string> {
     return getPrivateAddressFromIdentityKey(this.nodePrivateKey);

diff --git a/src/lib/nodes/channels/GatewayChannel.spec.ts b/src/lib/nodes/channels/GatewayChannel.spec.ts
@@ -338,7 +338,7 @@ class StubGatewayChannel extends GatewayChannel {
     );
   }
 
-  public getOutboundRAMFAddress(): string {
+  async getOutboundRAMFAddress(): Promise<string> {
     return StubGatewayChannel.OUTBOUND_RAMF_ADDRESS;
   }
 }
diff --git a/src/lib/nodes/channels/GatewayChannel.ts b/src/lib/nodes/channels/GatewayChannel.ts
@@ -14,7 +14,7 @@ export abstract class GatewayChannel extends Channel {
   public async *generateCargoes(messages: CargoMessageStream): AsyncIterable<Buffer> {
     const messagesAsArrayBuffers = convertBufferMessagesToArrayBuffer(messages);
     const cargoMessageSets = CargoMessageSet.batchMessagesSerialized(messagesAsArrayBuffers);
-    const recipientAddress = this.getOutboundRAMFAddress();
+    const recipientAddress = await this.getOutboundRAMFAddress();
     for await (const { messageSerialized, expiryDate } of cargoMessageSets) {
       const creationDate = getCargoCreationTime();
       const ttl = getSecondsBetweenDates(creationDate, expiryDate);

diff --git a/src/lib/nodes/channels/PrivateGatewayChannel.spec.ts b/src/lib/nodes/channels/PrivateGatewayChannel.spec.ts
@@ -201,7 +201,7 @@ class StubPrivateGatewayChannel extends PrivateGatewayChannel {
     );
   }
 
-  public getOutboundRAMFAddress(): string {
+  async getOutboundRAMFAddress(): Promise<string> {
     throw new Error('not implemented');
   }
 }
diff --git a/src/lib/nodes/channels/PrivatePublicGatewayChannel.spec.ts b/src/lib/nodes/channels/PrivatePublicGatewayChannel.spec.ts
@@ -84,8 +84,10 @@ beforeEach(() => {
   );
 });
 
-test('getOutboundRAMFAddress should return public address of public gateway', () => {
-  expect(channel.getOutboundRAMFAddress()).toEqual(`https://${PUBLIC_GATEWAY_PUBLIC_ADDRESS}`);
+test('getOutboundRAMFAddress should return public address of public gateway', async () => {
+  await expect(channel.getOutboundRAMFAddress()).resolves.toEqual(
+    `https://${PUBLIC_GATEWAY_PUBLIC_ADDRESS}`,
+  );
 });
 
 describe('Endpoint registration', () => {

diff --git a/src/lib/nodes/channels/PrivatePublicGatewayChannel.ts b/src/lib/nodes/channels/PrivatePublicGatewayChannel.ts
@@ -40,7 +40,7 @@ export class PrivatePublicGatewayChannel extends PrivateGatewayChannel {
     );
   }
 
-  getOutboundRAMFAddress(): string {
+  async getOutboundRAMFAddress(): Promise<string> {
     return `https://${this.publicGatewayPublicAddress}`;
   }
 
@@ -111,7 +111,7 @@ export class PrivatePublicGatewayChannel extends PrivateGatewayChannel {
     const ccr = new CargoCollectionRequest(cargoDeliveryAuthorization);
     const ccaPayload = await this.wrapMessagePayload(ccr);
     const cca = new CargoCollectionAuthorization(
-      this.getOutboundRAMFAddress(),
+      await this.getOutboundRAMFAddress(),
       this.nodeDeliveryAuth,
       Buffer.from(ccaPayload),
       { creationDate: startDate, ttl: differenceInSeconds(endDate, startDate) },