fix(backend): tests due to wallet address url change

golobitch · golobitch · commit e9d917388434 · 2025-03-02T01:32:08.000+01:00
diff --git a/packages/backend/src/asset/service.test.ts b/packages/backend/src/asset/service.test.ts
@@ -326,7 +326,7 @@ describe('Asset Service', (): void => {
 
       // make sure there is at least 1 wallet address using asset
       const walletAddress = walletAddressService.create({
-        url: 'https://alice.me/.well-known/pay',
+        address: 'https://alice.me/.well-known/pay',
         tenantId: Config.operatorTenantId,
         assetId: newAssetId
       })
diff --git a/packages/backend/src/graphql/resolvers/wallet_address.test.ts b/packages/backend/src/graphql/resolvers/wallet_address.test.ts
@@ -76,7 +76,7 @@ describe('Wallet Address Resolvers', (): void => {
       input = {
         assetId: asset.id,
         tenantId: Config.operatorTenantId,
-        url: 'https://alice.me/.well-known/pay'
+        address: 'https://alice.me/.well-known/pay'
       }
     })
 
@@ -121,7 +121,7 @@ describe('Wallet Address Resolvers', (): void => {
         expect(response.walletAddress).toEqual({
           __typename: 'WalletAddress',
           id: response.walletAddress.id,
-          url: input.url,
+          address: input.address,
           asset: {
             __typename: 'Asset',
             code: asset.code,
@@ -192,7 +192,7 @@ describe('Wallet Address Resolvers', (): void => {
       expect(response.walletAddress).toEqual({
         __typename: 'WalletAddress',
         id: response.walletAddress.id,
-        url: input.url,
+        address: input.address,
         asset: {
           __typename: 'Asset',
           code: asset.code,
@@ -318,7 +318,7 @@ describe('Wallet Address Resolvers', (): void => {
       const badInputData = {
         tenantId: 'ae4950b6-3e1b-4e50-ad24-25c065bdd3a9',
         assetId: input.assetId,
-        url: input.url
+        address: input.address
       }
       try {
         expect.assertions(2)
diff --git a/packages/backend/src/open_payments/payment/incoming/model.test.ts b/packages/backend/src/open_payments/payment/incoming/model.test.ts
@@ -45,7 +45,7 @@ describe('Models', (): void => {
       walletAddress = await createWalletAddress(deps, {
         tenantId: Config.operatorTenantId
       })
-      baseUrl = new URL(walletAddress.url).origin
+      baseUrl = new URL(walletAddress.address).origin
       incomingPayment = await createIncomingPayment(deps, {
         walletAddressId: walletAddress.id,
         metadata: { description: 'my payment' },
@@ -57,7 +57,7 @@ describe('Models', (): void => {
       test('returns incoming payment', async () => {
         expect(incomingPayment.toOpenPaymentsType(walletAddress)).toEqual({
           id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           completed: incomingPayment.completed,
           receivedAmount: serializeAmount(incomingPayment.receivedAmount),
           incomingAmount: incomingPayment.incomingAmount
@@ -85,7 +85,7 @@ describe('Models', (): void => {
           )
         ).toEqual({
           id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           completed: incomingPayment.completed,
           receivedAmount: serializeAmount(incomingPayment.receivedAmount),
           incomingAmount: incomingPayment.incomingAmount
@@ -110,7 +110,7 @@ describe('Models', (): void => {
           incomingPayment.toOpenPaymentsTypeWithMethods(walletAddress)
         ).toEqual({
           id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           completed: incomingPayment.completed,
           receivedAmount: serializeAmount(incomingPayment.receivedAmount),
           incomingAmount: incomingPayment.incomingAmount
@@ -141,7 +141,7 @@ describe('Models', (): void => {
             )
           ).toEqual({
             id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             completed: incomingPayment.completed,
             receivedAmount: serializeAmount(incomingPayment.receivedAmount),
             incomingAmount: incomingPayment.incomingAmount
diff --git a/packages/backend/src/open_payments/payment/incoming/routes.test.ts b/packages/backend/src/open_payments/payment/incoming/routes.test.ts
@@ -59,7 +59,7 @@ describe('Incoming Payment Routes', (): void => {
       tenantId,
       assetId: asset.id
     })
-    baseUrl = new URL(walletAddress.url).origin
+    baseUrl = new URL(walletAddress.address).origin
     incomingAmount = {
       value: BigInt('123'),
       assetScale: asset.scale,
@@ -97,7 +97,7 @@ describe('Incoming Payment Routes', (): void => {
         const response: Partial<OpenPaymentsIncomingPaymentWithPaymentMethods> =
           {
             id: incomingPayment.getUrl(walletAddress),
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             completed: false,
             incomingAmount:
               incomingPayment.incomingAmount &&
@@ -280,7 +280,7 @@ describe('Incoming Payment Routes', (): void => {
 
         expect(ctx.response.body).toEqual({
           id: `${baseUrl}/${tenantId}/incoming-payments/${incomingPaymentId}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           incomingAmount: incomingAmount ? amount : undefined,
           expiresAt: expiresAt || expect.any(String),
           createdAt: expect.any(String),
@@ -335,7 +335,7 @@ describe('Incoming Payment Routes', (): void => {
       expect(ctx.response).toSatisfyApiSpec()
       expect(ctx.body).toEqual({
         id: incomingPayment.getUrl(walletAddress),
-        walletAddress: walletAddress.url,
+        walletAddress: walletAddress.address,
         incomingAmount: {
           value: '123',
           assetCode: asset.code,
diff --git a/packages/backend/src/open_payments/payment/incoming/service.test.ts b/packages/backend/src/open_payments/payment/incoming/service.test.ts
@@ -60,7 +60,7 @@ describe('Incoming Payment Service', (): void => {
       assetId: asset.id
     })
     walletAddressId = address.id
-    client = address.url
+    client = address.address
   })
 
   afterEach(async (): Promise<void> => {
diff --git a/packages/backend/src/open_payments/payment/outgoing/model.ts b/packages/backend/src/open_payments/payment/outgoing/model.ts
@@ -108,7 +108,7 @@ export class OutgoingPayment
   }
 
   public getUrl(walletAddress: WalletAddress): string {
-    const url = new URL(walletAddress.url)
+    const url = new URL(walletAddress.address)
     return `${url.origin}/${this.tenantId}${OutgoingPayment.urlPath}/${this.id}`
   }
 
@@ -206,7 +206,7 @@ export class OutgoingPayment
   ): OpenPaymentsOutgoingPayment {
     return {
       id: this.getUrl(walletAddress),
-      walletAddress: walletAddress.url,
+      walletAddress: walletAddress.address,
       quoteId: this.quote?.getUrl(walletAddress) ?? undefined,
       receiveAmount: serializeAmount(this.receiveAmount),
       debitAmount: serializeAmount(this.debitAmount),
diff --git a/packages/backend/src/open_payments/payment/outgoing/routes.test.ts b/packages/backend/src/open_payments/payment/outgoing/routes.test.ts
@@ -84,7 +84,7 @@ describe('Outgoing Payment Routes', (): void => {
       tenantId,
       assetId: asset.id
     })
-    baseUrl = new URL(walletAddress.url).origin
+    baseUrl = new URL(walletAddress.address).origin
   })
 
   afterEach(async (): Promise<void> => {
@@ -121,7 +121,7 @@ describe('Outgoing Payment Routes', (): void => {
       getBody: (outgoingPayment) => {
         return {
           id: `${baseUrl}/${tenantId}/outgoing-payments/${outgoingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver: outgoingPayment.receiver,
           quoteId: outgoingPayment.quote.getUrl(walletAddress),
           debitAmount: serializeAmount(outgoingPayment.debitAmount),
@@ -252,7 +252,7 @@ describe('Outgoing Payment Routes', (): void => {
             .pop()
           expect(ctx.response.body).toEqual({
             id: `${baseUrl}/${tenantId}/outgoing-payments/${outgoingPaymentId}`,
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             receiver: payment.receiver,
             quoteId:
               'quoteId' in options ? options.quoteId : expect.any(String),
diff --git a/packages/backend/src/open_payments/payment/outgoing/service.test.ts b/packages/backend/src/open_payments/payment/outgoing/service.test.ts
@@ -281,7 +281,7 @@ describe('OutgoingPaymentService', (): void => {
       assetId: sendAssetId
     })
     walletAddressId = walletAddress.id
-    client = walletAddress.url
+    client = walletAddress.address
     const { id: destinationAssetId } = await createAsset(deps, destinationAsset)
     receiverWalletAddress = await createWalletAddress(deps, {
       tenantId,
diff --git a/packages/backend/src/open_payments/quote/model.ts b/packages/backend/src/open_payments/quote/model.ts
@@ -66,7 +66,7 @@ export class Quote extends WalletAddressSubresource {
   private debitAmountValue!: bigint
 
   public getUrl(walletAddress: WalletAddress): string {
-    const url = new URL(walletAddress.url)
+    const url = new URL(walletAddress.address)
     return `${url.origin}/${this.tenantId}${Quote.urlPath}/${this.id}`
   }
 
@@ -134,7 +134,7 @@ export class Quote extends WalletAddressSubresource {
   public toOpenPaymentsType(walletAddress: WalletAddress): OpenPaymentsQuote {
     return {
       id: this.getUrl(walletAddress),
-      walletAddress: walletAddress.url,
+      walletAddress: walletAddress.address,
       receiveAmount: serializeAmount(this.receiveAmount),
       debitAmount: serializeAmount(this.debitAmount),
       receiver: this.receiver,
diff --git a/packages/backend/src/open_payments/quote/routes.test.ts b/packages/backend/src/open_payments/quote/routes.test.ts
@@ -109,7 +109,7 @@ describe('Quote Routes', (): void => {
       getBody: (quote) => {
         return {
           id: `${baseUrl}/${quote.tenantId}/quotes/${quote.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver: quote.receiver,
           debitAmount: serializeAmount(quote.debitAmount),
           receiveAmount: serializeAmount(quote.receiveAmount),
@@ -145,7 +145,7 @@ describe('Quote Routes', (): void => {
 
     test('returns error on invalid debitAmount asset', async (): Promise<void> => {
       options = {
-        walletAddress: walletAddress.url,
+        walletAddress: walletAddress.address,
         receiver,
         debitAmount: {
           ...debitAmount,
@@ -174,7 +174,7 @@ describe('Quote Routes', (): void => {
         '$description',
         async ({ debitAmount, receiveAmount }): Promise<void> => {
           options = {
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             receiver,
             method: 'ilp'
           }
@@ -227,7 +227,7 @@ describe('Quote Routes', (): void => {
           assert.ok(quote)
           expect(ctx.response.body).toEqual({
             id: `${baseUrl}/${tenantId}/quotes/${quoteId}`,
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             receiver: quote.receiver,
             debitAmount: {
               ...quote.debitAmount,
@@ -246,7 +246,7 @@ describe('Quote Routes', (): void => {
 
       test('receiver.incomingAmount', async (): Promise<void> => {
         options = {
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver,
           method: 'ilp'
         }
@@ -279,7 +279,7 @@ describe('Quote Routes', (): void => {
         assert.ok(quote)
         expect(ctx.response.body).toEqual({
           id: `${baseUrl}/${tenantId}/quotes/${quoteId}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver: options.receiver,
           debitAmount: {
             ...quote.debitAmount,
diff --git a/packages/backend/src/open_payments/quote/service.test.ts b/packages/backend/src/open_payments/quote/service.test.ts
@@ -144,7 +144,7 @@ describe('QuoteService', (): void => {
         createQuote(deps, {
           tenantId,
           walletAddressId: sendingWalletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount: {
             value: BigInt(56),
             assetCode: asset.code,
@@ -446,7 +446,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId: unknownTenantId,
           walletAddressId: walletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
@@ -466,7 +466,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId,
           walletAddressId: unknownWalletAddressId,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
@@ -490,7 +490,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId,
           walletAddressId: walletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
@@ -502,7 +502,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId,
           walletAddressId: sendingWalletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
diff --git a/packages/backend/src/open_payments/receiver/model.test.ts b/packages/backend/src/open_payments/receiver/model.test.ts
@@ -65,7 +65,7 @@ describe('Receiver Model', (): void => {
         sharedSecret: expect.any(Buffer),
         incomingPayment: {
           id: incomingPayment.getUrl(walletAddress),
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           updatedAt: incomingPayment.updatedAt,
           createdAt: incomingPayment.createdAt,
           completed: incomingPayment.completed,
diff --git a/packages/backend/src/open_payments/receiver/service.test.ts b/packages/backend/src/open_payments/receiver/service.test.ts
@@ -105,7 +105,7 @@ describe('Receiver Service', (): void => {
           sharedSecret: expect.any(Buffer),
           incomingPayment: {
             id: incomingPayment.getUrl(walletAddress),
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             incomingAmount: incomingPayment.incomingAmount,
             receivedAmount: incomingPayment.receivedAmount,
             completed: false,
@@ -315,7 +315,7 @@ describe('Receiver Service', (): void => {
             'create'
           )
           const receiver = await receiverService.create({
-            walletAddressUrl: walletAddress.url,
+            walletAddressUrl: walletAddress.address,
             incomingAmount,
             expiresAt,
             metadata,
@@ -367,7 +367,7 @@ describe('Receiver Service', (): void => {
 
         await expect(
           receiverService.create({
-            walletAddressUrl: walletAddress.url,
+            walletAddressUrl: walletAddress.address,
             tenantId
           })
         ).resolves.toEqual(ReceiverError.InvalidAmount)
@@ -380,7 +380,7 @@ describe('Receiver Service', (): void => {
 
         await expect(
           receiverService.create({
-            walletAddressUrl: walletAddress.url,
+            walletAddressUrl: walletAddress.address,
             tenantId
           })
         ).rejects.toThrow(
diff --git a/packages/backend/src/open_payments/wallet_address/key/routes.test.ts b/packages/backend/src/open_payments/wallet_address/key/routes.test.ts
@@ -61,7 +61,7 @@ describe('Wallet Address Keys Routes', (): void => {
         headers: { Accept: 'application/json' },
         url: `/jwks.json`
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       await expect(walletAddressKeyRoutes.get(ctx)).resolves.toBeUndefined()
       expect(ctx.response).toSatisfyApiSpec()
@@ -79,7 +79,7 @@ describe('Wallet Address Keys Routes', (): void => {
         headers: { Accept: 'application/json' },
         url: `/jwks.json`
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       await expect(walletAddressKeyRoutes.get(ctx)).resolves.toBeUndefined()
       expect(ctx.body).toEqual({
@@ -134,7 +134,7 @@ describe('Wallet Address Keys Routes', (): void => {
       const ctx = createContext<WalletAddressUrlContext>({
         headers: { Accept: 'application/json' }
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       const getOrPollByUrlSpy = jest.spyOn(
         walletAddressService,
diff --git a/packages/backend/src/open_payments/wallet_address/middleware.test.ts b/packages/backend/src/open_payments/wallet_address/middleware.test.ts
diff --git a/packages/backend/src/open_payments/wallet_address/middleware.ts b/packages/backend/src/open_payments/wallet_address/middleware.ts
diff --git a/packages/backend/src/open_payments/wallet_address/model.test.ts b/packages/backend/src/open_payments/wallet_address/model.test.ts
diff --git a/packages/backend/src/open_payments/wallet_address/routes.test.ts b/packages/backend/src/open_payments/wallet_address/routes.test.ts
diff --git a/packages/backend/src/shared/pagination.test.ts b/packages/backend/src/shared/pagination.test.ts
