feat(3114): fix tests.

interledger · Dec 11, 2024 · f29862a · f29862a
1 parent b5a1667
commit f29862a
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/packages/backend/src/open_payments/payment/incoming/service.test.ts b/packages/backend/src/open_payments/payment/incoming/service.test.ts
@@ -53,7 +53,10 @@ describe('Incoming Payment Service', (): void => {
 
   beforeEach(async (): Promise<void> => {
     asset = await createAsset(deps)
-    const address = await createWalletAddress(deps, { assetId: asset.id })
+    const address = await createWalletAddress(deps, {
+      tenantId: config.operatorTenantId,
+      assetId: asset.id
+    })
     walletAddressId = address.id
     client = address.url
   })

diff --git a/packages/backend/src/open_payments/payment/outgoing/service.test.ts b/packages/backend/src/open_payments/payment/outgoing/service.test.ts
@@ -272,12 +272,14 @@ describe('OutgoingPaymentService', (): void => {
     const { id: sendAssetId } = await createAsset(deps, asset)
     assetId = sendAssetId
     const walletAddress = await createWalletAddress(deps, {
+      tenantId: config.operatorTenantId,
       assetId: sendAssetId
     })
     walletAddressId = walletAddress.id
     client = walletAddress.url
     const { id: destinationAssetId } = await createAsset(deps, destinationAsset)
     receiverWalletAddress = await createWalletAddress(deps, {
+      tenantId: config.operatorTenantId,
       assetId: destinationAssetId,
       mockServerPort: appContainer.openPaymentsPort
     })
@@ -408,8 +410,12 @@ describe('OutgoingPaymentService', (): void => {
       let outgoingPayment: OutgoingPayment
       let otherOutgoingPayment: OutgoingPayment
       beforeEach(async (): Promise<void> => {
-        otherSenderWalletAddress = await createWalletAddress(deps, { assetId })
+        otherSenderWalletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId,
+          assetId
+        })
         otherReceiverWalletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId,
           assetId
         })
         const incomingPayment = await createIncomingPayment(deps, {
@@ -974,7 +980,9 @@ describe('OutgoingPaymentService', (): void => {
           validDestination: false,
           method: 'ilp'
         })
-        const walletAddress = await createWalletAddress(deps)
+        const walletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId
+        })
         const walletAddressUpdated = await WalletAddress.query(
           knex
         ).patchAndFetchById(walletAddress.id, { deactivatedAt: new Date() })

diff --git a/packages/backend/src/open_payments/quote/service.test.ts b/packages/backend/src/open_payments/quote/service.test.ts
@@ -96,10 +96,12 @@ describe('QuoteService', (): void => {
       scale: debitAmount.assetScale
     })
     sendingWalletAddress = await createWalletAddress(deps, {
+      tenantId: config.operatorTenantId,
       assetId: sendAssetId
     })
     const { id: destinationAssetId } = await createAsset(deps, destinationAsset)
     receivingWalletAddress = await createWalletAddress(deps, {
+      tenantId: config.operatorTenantId,
       assetId: destinationAssetId,
       mockServerPort: appContainer.openPaymentsPort
     })
@@ -525,9 +527,11 @@ describe('QuoteService', (): void => {
           scale: 2
         })
         sendingWalletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId,
           assetId: asset.id
         })
         receivingWalletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId,
           assetId: asset.id
         })
       })
@@ -633,9 +637,11 @@ describe('QuoteService', (): void => {
           scale: 2
         })
         sendingWalletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId,
           assetId: sendAsset.id
         })
         receivingWalletAddress = await createWalletAddress(deps, {
+          tenantId: config.operatorTenantId,
           assetId: receiveAsset.id
         })
       })

diff --git a/packages/backend/src/open_payments/wallet_address/routes.test.ts b/packages/backend/src/open_payments/wallet_address/routes.test.ts
@@ -165,7 +165,7 @@ describe('Wallet Address Routes', (): void => {
         assetScale: walletAddress.asset.scale,
         // Ensure the tenant id is returned for auth and resource server:
         authServer: `${config.authServerGrantUrl}/${config.operatorTenantId}`,
-        resourceServer: `${config.openPaymentsUrl}/${config.operatorTenantId}`,
+        resourceServer: `${config.openPaymentsUrl}/${config.operatorTenantId}`
       })
     })
   })

diff --git a/packages/backend/src/open_payments/wallet_address/routes.ts b/packages/backend/src/open_payments/wallet_address/routes.ts
@@ -11,6 +11,7 @@ import {
 } from '../../shared/pagination'
 import { OpenPaymentsServerRouteError } from '../route-errors'
 import { IAppConfig } from '../../config/app'
+import { ensureTrailingSlash } from '../../shared/utils'
 
 interface ServiceDependencies {
   config: IAppConfig
@@ -65,11 +66,6 @@ export async function getWalletAddress(
   })
 }
 
-function ensureTrailingSlash(str: string): string {
-  if (!str.endsWith('/')) return `${str}/`
-  return str
-}
-
 interface ListSubresourceOptions<M extends WalletAddressSubresource> {
   ctx: ListContext
   getWalletAddressPage: WalletAddressSubresourceService<M>['getWalletAddressPage']

diff --git a/packages/backend/src/shared/utils.ts b/packages/backend/src/shared/utils.ts
@@ -186,3 +186,8 @@ export async function verifyApiSignature(
 
   return verifyApiSignatureDigest(signature as string, ctx.request, config)
 }
+
+export function ensureTrailingSlash(str: string): string {
+  if (!str.endsWith('/')) return `${str}/`
+  return str
+}
diff --git a/packages/backend/src/tests/quote.ts b/packages/backend/src/tests/quote.ts
@@ -168,6 +168,7 @@ export async function createQuote(
   const withGraphFetchedArray = [
     'asset',
     'walletAddress',
+    'walletAddress.tenant',
     'walletAddress.asset'
   ]
   if (withFee) {