chore(env): rename ilp connector address to ilp connector url

interledger · Jun 25, 2024 · 9adfdd4 · 9adfdd4
1 parent cc4533d
commit 9adfdd4
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 55 deletions.
diff --git a/localenv/cloud-nine-wallet/docker-compose.yml b/localenv/cloud-nine-wallet/docker-compose.yml
@@ -72,7 +72,7 @@ services:
       EXCHANGE_RATES_URL: http://cloud-nine-wallet/rates
       REDIS_URL: redis://shared-redis:6379/0
       WALLET_ADDRESS_URL: ${CLOUD_NINE_WALLET_ADDRESS_URL:-https://cloud-nine-wallet-backend/.well-known/pay}
-      ILP_CONNECTOR_ADDRESS: ${CLOUD_NINE_CONNECTOR_URL}
+      ILP_CONNECTOR_URL: ${CLOUD_NINE_CONNECTOR_URL}
       ENABLE_TELEMETRY: true
       KEY_ID: 7097F83B-CB84-469E-96C6-2141C72E22C0
     depends_on:

diff --git a/localenv/happy-life-bank/docker-compose.yml b/localenv/happy-life-bank/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       AUTH_SERVER_GRANT_URL: ${HAPPY_LIFE_BANK_AUTH_SERVER_DOMAIN:-http://happy-life-bank-auth:3006}
       AUTH_SERVER_INTROSPECTION_URL: http://happy-life-bank-auth:3007
       ILP_ADDRESS: test.happy-life-bank
-      ILP_CONNECTOR_ADDRESS: http://127.0.0.1:4002
+      ILP_CONNECTOR_URL: http://127.0.0.1:4002
       STREAM_SECRET: BjPXtnd00G2mRQwP/8ZpwyZASOch5sUXT5o0iR5b5wU=
       API_SECRET: iyIgCprjb9uL8wFckR+pLEkJWMB7FJhgkvqhTQR/964=
       WEBHOOK_URL: http://happy-life-bank/webhooks

diff --git a/packages/backend/jest.config.js b/packages/backend/jest.config.js
@@ -8,7 +8,7 @@ process.env.LOG_LEVEL = 'silent'
 process.env.INSTANCE_NAME = 'Rafiki'
 process.env.KEY_ID = 'myKey'
 process.env.OPEN_PAYMENTS_URL = 'http://127.0.0.1:3000'
-process.env.ILP_CONNECTOR_ADDRESS = 'http://127.0.0.1:3002'
+process.env.ILP_CONNECTOR_URL = 'http://127.0.0.1:3002'
 process.env.ILP_ADDRESS = 'test.rafiki'
 process.env.AUTH_SERVER_GRANT_URL = 'http://127.0.0.1:3006'
 process.env.AUTH_SERVER_INTROSPECTION_URL = 'http://127.0.0.1:3007/'

diff --git a/packages/backend/src/config/app.ts b/packages/backend/src/config/app.ts
@@ -97,7 +97,7 @@ export const Config = {
     process.env.REDIS_TLS_CERT_FILE_PATH
   ),
   ilpAddress: envString('ILP_ADDRESS'),
-  ilpConnectorAddress: envString('ILP_CONNECTOR_ADDRESS'),
+  ilpConnectorUrl: envString('ILP_CONNECTOR_URL'),
   instanceName: envString('INSTANCE_NAME'),
   streamSecret: Buffer.from(process.env.STREAM_SECRET || '', 'base64'),
   useTigerbeetle: envBool('USE_TIGERBEETLE', true),

diff --git a/packages/backend/src/graphql/resolvers/auto-peering.test.ts b/packages/backend/src/graphql/resolvers/auto-peering.test.ts
@@ -112,7 +112,7 @@ describe('Auto Peering Resolvers', (): void => {
 
       const peerDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         name: 'Test Peer',
         httpToken: 'httpToken'
       }
@@ -137,7 +137,7 @@ describe('Auto Peering Resolvers', (): void => {
           outgoing: {
             __typename: 'HttpOutgoing',
             authToken: expect.any(String),
-            endpoint: peerDetails.ilpConnectorAddress
+            endpoint: peerDetails.ilpConnectorUrl
           }
         },
         maxPacketAmount: input.maxPacketAmount?.toString(),
@@ -153,7 +153,7 @@ describe('Auto Peering Resolvers', (): void => {
 
       const peerDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         name: 'Test Peer',
         httpToken: 'httpToken'
       }
@@ -187,7 +187,7 @@ describe('Auto Peering Resolvers', (): void => {
           outgoing: {
             __typename: 'HttpOutgoing',
             authToken: expect.any(String),
-            endpoint: peerDetails.ilpConnectorAddress
+            endpoint: peerDetails.ilpConnectorUrl
           }
         },
         maxPacketAmount: input.maxPacketAmount?.toString(),
@@ -221,7 +221,7 @@ describe('Auto Peering Resolvers', (): void => {
           outgoing: {
             __typename: 'HttpOutgoing',
             authToken: expect.any(String),
-            endpoint: peerDetails.ilpConnectorAddress
+            endpoint: peerDetails.ilpConnectorUrl
           }
         },
         maxPacketAmount: secondInput.maxPacketAmount?.toString(),

diff --git a/packages/backend/src/payment-method/ilp/auto-peering/routes.test.ts b/packages/backend/src/payment-method/ilp/auto-peering/routes.test.ts
@@ -39,7 +39,7 @@ describe('Auto Peering Routes', (): void => {
         url: `/`,
         body: {
           staticIlpAddress: 'test.rafiki-money',
-          ilpConnectorAddress: 'http://peer.rafiki.money',
+          ilpConnectorUrl: 'http://peer.rafiki.money',
           asset: { code: asset.code, scale: asset.scale },
           httpToken: 'someHttpToken',
           maxPacketAmount: 1000,
@@ -53,7 +53,7 @@ describe('Auto Peering Routes', (): void => {
       expect(ctx.status).toBe(200)
       expect(ctx.body).toEqual({
         staticIlpAddress: config.ilpAddress,
-        ilpConnectorAddress: config.ilpConnectorAddress,
+        ilpConnectorUrl: config.ilpConnectorUrl,
         httpToken: expect.any(String),
         name: config.instanceName
       })
@@ -65,7 +65,7 @@ describe('Auto Peering Routes', (): void => {
         url: `/`,
         body: {
           staticIlpAddress: 'test.rafiki-money',
-          ilpConnectorAddress: 'http://peer.rafiki.money',
+          ilpConnectorUrl: 'http://peer.rafiki.money',
           asset: { code: 'ABC', scale: 2 },
           httpToken: 'someHttpToken'
         }

diff --git a/packages/backend/src/payment-method/ilp/auto-peering/routes.ts b/packages/backend/src/payment-method/ilp/auto-peering/routes.ts
@@ -5,7 +5,7 @@ import { AutoPeeringService } from './service'
 
 interface PeeringRequestArgs {
   staticIlpAddress: string
-  ilpConnectorAddress: string
+  ilpConnectorUrl: string
   asset: { code: string; scale: number }
   httpToken: string
   maxPacketAmount?: number

diff --git a/packages/backend/src/payment-method/ilp/auto-peering/service.test.ts b/packages/backend/src/payment-method/ilp/auto-peering/service.test.ts
@@ -51,7 +51,7 @@ describe('Auto Peering Service', (): void => {
 
       const args: PeeringRequestArgs = {
         staticIlpAddress: 'test.rafiki-money',
-        ilpConnectorAddress: 'http://peer.rafiki.money',
+        ilpConnectorUrl: 'http://peer.rafiki.money',
         asset: { code: asset.code, scale: asset.scale },
         httpToken: 'someHttpToken',
         name: 'Rafiki Money',
@@ -64,7 +64,7 @@ describe('Auto Peering Service', (): void => {
         autoPeeringService.acceptPeeringRequest(args)
       ).resolves.toEqual({
         staticIlpAddress: config.ilpAddress,
-        ilpConnectorAddress: config.ilpConnectorAddress,
+        ilpConnectorUrl: config.ilpConnectorUrl,
         httpToken: expect.any(String),
         name: config.instanceName
       })
@@ -78,7 +78,7 @@ describe('Auto Peering Service', (): void => {
           incoming: { authTokens: [args.httpToken] },
           outgoing: {
             authToken: expect.any(String),
-            endpoint: args.ilpConnectorAddress
+            endpoint: args.ilpConnectorUrl
           }
         }
       })
@@ -89,7 +89,7 @@ describe('Auto Peering Service', (): void => {
 
       const args: PeeringRequestArgs = {
         staticIlpAddress: 'test.rafiki-money',
-        ilpConnectorAddress: 'http://peer.rafiki.money',
+        ilpConnectorUrl: 'http://peer.rafiki.money',
         asset: { code: asset.code, scale: asset.scale },
         httpToken: 'someHttpToken',
         name: 'Rafiki Money'
@@ -101,7 +101,7 @@ describe('Auto Peering Service', (): void => {
         autoPeeringService.acceptPeeringRequest(args)
       ).resolves.toEqual({
         staticIlpAddress: config.ilpAddress,
-        ilpConnectorAddress: config.ilpConnectorAddress,
+        ilpConnectorUrl: config.ilpConnectorUrl,
         httpToken: expect.any(String),
         name: config.instanceName
       })
@@ -111,7 +111,7 @@ describe('Auto Peering Service', (): void => {
         autoPeeringService.acceptPeeringRequest(args)
       ).resolves.toEqual({
         staticIlpAddress: config.ilpAddress,
-        ilpConnectorAddress: config.ilpConnectorAddress,
+        ilpConnectorUrl: config.ilpConnectorUrl,
         httpToken: expect.any(String),
         name: config.instanceName
       })
@@ -122,7 +122,7 @@ describe('Auto Peering Service', (): void => {
           incoming: { authTokens: [args.httpToken] },
           outgoing: {
             authToken: expect.any(String),
-            endpoint: args.ilpConnectorAddress
+            endpoint: args.ilpConnectorUrl
           }
         }
       })
@@ -132,7 +132,7 @@ describe('Auto Peering Service', (): void => {
     test('returns error if unknown asset', async (): Promise<void> => {
       const args: PeeringRequestArgs = {
         staticIlpAddress: 'test.rafiki-money',
-        ilpConnectorAddress: 'http://peer.rafiki.money',
+        ilpConnectorUrl: 'http://peer.rafiki.money',
         asset: { code: 'USD', scale: 2 },
         httpToken: 'someHttpToken'
       }
@@ -147,7 +147,7 @@ describe('Auto Peering Service', (): void => {
 
       const args: PeeringRequestArgs = {
         staticIlpAddress: 'test.rafiki-money',
-        ilpConnectorAddress: 'invalid',
+        ilpConnectorUrl: 'invalid',
         asset: { code: asset.code, scale: asset.scale },
         httpToken: 'someHttpToken'
       }
@@ -162,7 +162,7 @@ describe('Auto Peering Service', (): void => {
 
       const args: PeeringRequestArgs = {
         staticIlpAddress: 'invalid',
-        ilpConnectorAddress: 'http://peer.rafiki.money',
+        ilpConnectorUrl: 'http://peer.rafiki.money',
         asset: { code: asset.code, scale: asset.scale },
         httpToken: 'someHttpToken'
       }
@@ -177,7 +177,7 @@ describe('Auto Peering Service', (): void => {
 
       const args: PeeringRequestArgs = {
         staticIlpAddress: 'test.rafiki-money',
-        ilpConnectorAddress: 'http://peer.rafiki.money',
+        ilpConnectorUrl: 'http://peer.rafiki.money',
         asset: { code: asset.code, scale: asset.scale },
         httpToken: 'someHttpToken'
       }
@@ -219,7 +219,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }
@@ -232,7 +232,7 @@ describe('Auto Peering Service', (): void => {
               scale: asset.scale
             },
             httpToken: expect.any(String),
-            ilpConnectorAddress: config.ilpConnectorAddress,
+            ilpConnectorUrl: config.ilpConnectorUrl,
             maxPacketAmount: Number(args.maxPacketAmount),
             name: config.instanceName,
             staticIlpAddress: config.ilpAddress
@@ -255,7 +255,7 @@ describe('Auto Peering Service', (): void => {
             authTokens: [peerDetails.httpToken]
           },
           outgoing: {
-            endpoint: peerDetails.ilpConnectorAddress,
+            endpoint: peerDetails.ilpConnectorUrl,
             authToken: expect.any(String)
           }
         },
@@ -280,7 +280,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }
@@ -293,7 +293,7 @@ describe('Auto Peering Service', (): void => {
               scale: asset.scale
             },
             httpToken: expect.any(String),
-            ilpConnectorAddress: config.ilpConnectorAddress,
+            ilpConnectorUrl: config.ilpConnectorUrl,
             maxPacketAmount: Number(args.maxPacketAmount),
             name: config.instanceName,
             staticIlpAddress: config.ilpAddress
@@ -326,7 +326,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }
@@ -339,7 +339,7 @@ describe('Auto Peering Service', (): void => {
               scale: asset.scale
             },
             httpToken: expect.any(String),
-            ilpConnectorAddress: config.ilpConnectorAddress,
+            ilpConnectorUrl: config.ilpConnectorUrl,
             maxPacketAmount: Number(args.maxPacketAmount),
             name: config.instanceName,
             staticIlpAddress: config.ilpAddress
@@ -366,7 +366,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }
@@ -387,7 +387,7 @@ describe('Auto Peering Service', (): void => {
             authTokens: [peerDetails.httpToken]
           },
           outgoing: {
-            endpoint: peerDetails.ilpConnectorAddress,
+            endpoint: peerDetails.ilpConnectorUrl,
             authToken: expect.any(String)
           }
         },
@@ -477,7 +477,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: '',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }
@@ -500,7 +500,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: '',
+        ilpConnectorUrl: '',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }
@@ -523,7 +523,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: uuid(),
         name: 'Peer 2'
       }
@@ -579,7 +579,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: uuid(),
         name: 'Peer 2'
       }
@@ -617,7 +617,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: uuid(),
         name: 'Peer 2'
       }
@@ -649,7 +649,7 @@ describe('Auto Peering Service', (): void => {
 
       const peerDetails: PeeringDetails = {
         staticIlpAddress: 'test.peer2',
-        ilpConnectorAddress: 'http://peer-two.com',
+        ilpConnectorUrl: 'http://peer-two.com',
         httpToken: 'peerHttpToken',
         name: 'Peer 2'
       }