fix(tests): some of them

interledger · Mar 2, 2025 · f33bb85 · f33bb85
1 parent 6f72bf7
commit f33bb85
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 82 deletions.
diff --git a/localenv/mock-account-servicing-entity/generated/graphql.ts b/localenv/mock-account-servicing-entity/generated/graphql.ts
diff --git a/packages/backend/src/graphql/generated/graphql.schema.json b/packages/backend/src/graphql/generated/graphql.schema.json
diff --git a/packages/backend/src/graphql/generated/graphql.ts b/packages/backend/src/graphql/generated/graphql.ts
diff --git a/packages/backend/src/graphql/resolvers/wallet_address.test.ts b/packages/backend/src/graphql/resolvers/wallet_address.test.ts
@@ -714,7 +714,7 @@ describe('Wallet Address Resolvers', (): void => {
         const newWalletAddress = await walletAddressService.create({
           assetId: (newAsset as Asset).id,
           tenantId: newTenant!.id,
-          url: 'https://alice.me/.well-known/pay-2'
+          address: 'https://alice.me/.well-known/pay-2'
         })
         const id = (newWalletAddress as WalletAddressModel).id
 
@@ -824,7 +824,7 @@ describe('Wallet Address Resolvers', (): void => {
             code: walletAddress.asset.code,
             scale: walletAddress.asset.scale
           },
-          url: walletAddress.url,
+          address: walletAddress.address,
           publicName: publicName ?? null,
           additionalProperties: [
             {
@@ -856,7 +856,7 @@ describe('Wallet Address Resolvers', (): void => {
           publicName,
           createLiquidityAccount: true
         })
-        const args = { url: walletAddress.url }
+        const args = { url: walletAddress.address }
         const query = await appContainer.apolloClient
           .query({
             query: gql`
@@ -868,7 +868,7 @@ describe('Wallet Address Resolvers', (): void => {
                     code
                     scale
                   }
-                  url
+                  address
                   publicName
                   additionalProperties {
                     key
@@ -897,7 +897,7 @@ describe('Wallet Address Resolvers', (): void => {
             code: walletAddress.asset.code,
             scale: walletAddress.asset.scale
           },
-          url: walletAddress.url,
+          address: walletAddress.address,
           publicName: publicName ?? null,
           additionalProperties: []
         })
@@ -967,7 +967,7 @@ describe('Wallet Address Resolvers', (): void => {
                       code
                       scale
                     }
-                    url
+                    address
                     publicName
                   }
                   cursor
@@ -996,7 +996,7 @@ describe('Wallet Address Resolvers', (): void => {
             code: walletAddress.asset.code,
             scale: walletAddress.asset.scale
           },
-          url: walletAddress.url,
+          address: walletAddress.address,
           publicName: walletAddress.publicName
         })
       })
@@ -1022,7 +1022,7 @@ describe('Wallet Address Resolvers', (): void => {
                       code
                       scale
                     }
-                    url
+                    address
                     publicName
                   }
                   cursor
@@ -1054,7 +1054,7 @@ describe('Wallet Address Resolvers', (): void => {
             code: walletAddress.asset.code,
             scale: walletAddress.asset.scale
           },
-          url: walletAddress.url,
+          address: walletAddress.address,
           publicName: walletAddress.publicName
         })
       })

diff --git a/packages/backend/src/graphql/resolvers/wallet_address.ts b/packages/backend/src/graphql/resolvers/wallet_address.ts
@@ -122,7 +122,7 @@ export const createWalletAddress: MutationResolvers<ForTenantIdContext>['createW
       tenantId,
       additionalProperties: addProps,
       publicName: args.input.publicName,
-      url: args.input.url
+      address: args.input.address
     }
 
     const walletAddressOrError = await walletAddressService.create(options)
@@ -206,7 +206,7 @@ export function walletAddressToGraphql(
 ): SchemaWalletAddress {
   return {
     id: walletAddress.id,
-    url: walletAddress.url,
+    address: walletAddress.address,
     asset: assetToGraphql(walletAddress.asset),
     publicName: walletAddress.publicName ?? undefined,
     createdAt: new Date(+walletAddress.createdAt).toISOString(),

diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql
@@ -792,8 +792,8 @@ type WalletAddress implements Model {
   "Current amount of liquidity available for this wallet address."
   liquidity: UInt64
 
-  "Wallet Address URL."
-  url: String!
+  "Wallet Address."
+  address: String!
 
   "Public name associated with the wallet address. This is visible to anyone with the wallet address URL."
   publicName: String
@@ -1298,8 +1298,8 @@ input CreateWalletAddressInput {
   tenantId: ID
   "Unique identifier of the asset associated with the wallet address. This cannot be changed."
   assetId: String!
-  "Wallet address URL. This cannot be changed."
-  url: String!
+  "Wallet address. This cannot be changed."
+  address: String!
   "Public name associated with the wallet address. This is visible to anyone with the wallet address URL."
   publicName: String
   "Unique key to ensure duplicate or retried requests are processed only once. For more information, refer to [idempotency](https://rafiki.dev/apis/graphql/admin-api-overview/#idempotency)."

diff --git a/packages/backend/src/open_payments/payment/incoming/model.ts b/packages/backend/src/open_payments/payment/incoming/model.ts
@@ -144,7 +144,7 @@ export class IncomingPayment
   }
 
   public getUrl(walletAddress: WalletAddress): string {
-    const url = new URL(walletAddress.url)
+    const url = new URL(walletAddress.address)
     return `${url.origin}/${walletAddress.tenantId}${IncomingPayment.urlPath}/${this.id}`
   }
 
@@ -225,7 +225,7 @@ export class IncomingPayment
   ): OpenPaymentsIncomingPayment {
     return {
       id: this.getUrl(walletAddress),
-      walletAddress: walletAddress.url,
+      walletAddress: walletAddress.address,
       incomingAmount: this.incomingAmount
         ? serializeAmount(this.incomingAmount)
         : undefined,

diff --git a/packages/backend/src/open_payments/quote/routes.test.ts b/packages/backend/src/open_payments/quote/routes.test.ts
@@ -85,7 +85,7 @@ describe('Quote Routes', (): void => {
       tenantId,
       assetId
     })
-    baseUrl = new URL(walletAddress.url).origin
+    baseUrl = new URL(walletAddress.address).origin
   })
 
   afterEach(async (): Promise<void> => {

diff --git a/packages/backend/src/tests/walletAddress.ts b/packages/backend/src/tests/walletAddress.ts
@@ -12,6 +12,8 @@ import { isWalletAddressError } from '../open_payments/wallet_address/errors'
 import { WalletAddress } from '../open_payments/wallet_address/model'
 import { CreateOptions as BaseCreateOptions } from '../open_payments/wallet_address/service'
 import { LiquidityAccountType } from '../accounting/service'
+import { createTenantSettings } from './tenantSettings'
+import { TenantSettingKeys } from '../tenants/settings/model'
 
 const nock = (global as unknown as { nock: typeof import('nock') }).nock
 
@@ -31,14 +33,25 @@ export async function createWalletAddress(
 ): Promise<MockWalletAddress> {
   const walletAddressService = await deps.use('walletAddressService')
   const tenantIdToUse = options.tenantId || (await createTenant(deps)).id
+
+  const baseWalletAddressUrl = new URL(
+    options.address || `https://${faker.internet.domainName()}`
+  )
+  await createTenantSettings(deps, {
+    tenantId: tenantIdToUse,
+    setting: [
+      {
+        key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
+        value: baseWalletAddressUrl.origin
+      }
+    ]
+  })
   const walletAddressOrError = (await walletAddressService.create({
     ...options,
     assetId:
       options.assetId || (await createAsset(deps, undefined, tenantIdToUse)).id,
     tenantId: tenantIdToUse,
-    address:
-      options.address ||
-      `https://${faker.internet.domainName()}/.well-known/pay`
+    address: options.address || `${baseWalletAddressUrl.origin}/.well-known/pay`
   })) as MockWalletAddress
   if (isWalletAddressError(walletAddressOrError)) {
     throw new Error(walletAddressOrError)