feat: tenanted quotes - formatting

interledger · Dec 17, 2024 · 5991a8c · 5991a8c
1 parent ed89fb9
commit 5991a8c
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 48 deletions.
diff --git a/packages/backend/src/graphql/resolvers/outgoing_payment.test.ts b/packages/backend/src/graphql/resolvers/outgoing_payment.test.ts
@@ -100,9 +100,7 @@ describe('OutgoingPayment Resolvers', (): void => {
     let walletAddressId: string
 
     beforeEach(async (): Promise<void> => {
-      tenantId = (
-        await createTenant(deps)
-      ).id
+      tenantId = (await createTenant(deps)).id
       walletAddressId = (
         await createWalletAddress(deps, {
           assetId: asset.id
@@ -565,9 +563,7 @@ describe('OutgoingPayment Resolvers', (): void => {
     }
 
     beforeEach(async (): Promise<void> => {
-      tenantId = (
-        await createTenant(deps)
-      ).id
+      tenantId = (await createTenant(deps)).id
     })
 
     test('success (metadata)', async (): Promise<void> => {
@@ -715,9 +711,7 @@ describe('OutgoingPayment Resolvers', (): void => {
     const mockIncomingPaymentUrl = `https://${faker.internet.domainName()}/incoming-payments/${uuid()}`
 
     beforeEach(async (): Promise<void> => {
-      tenantId = (
-        await createTenant(deps)
-      ).id
+      tenantId = (await createTenant(deps)).id
     })
 
     test('create', async (): Promise<void> => {
@@ -999,9 +993,7 @@ describe('OutgoingPayment Resolvers', (): void => {
     let tenantId: string
 
     beforeEach(async (): Promise<void> => {
-      tenantId = (
-        await createTenant(deps)
-      ).id
+      tenantId = (await createTenant(deps)).id
       walletAddressId = (
         await createWalletAddress(deps, {
           assetId: asset.id

diff --git a/packages/backend/src/open_payments/payment/combined/service.test.ts b/packages/backend/src/open_payments/payment/combined/service.test.ts
@@ -42,9 +42,7 @@ describe('Combined Payment Service', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    tenantId = (
-      await createTenant(deps)
-    ).id
+    tenantId = (await createTenant(deps)).id
     sendAsset = await createAsset(deps)
     receiveAsset = await createAsset(deps)
     sendWalletAddressId = (

diff --git a/packages/backend/src/open_payments/payment/outgoing/service.ts b/packages/backend/src/open_payments/payment/outgoing/service.ts
@@ -372,9 +372,7 @@ async function createOutgoingPayment(
           description: 'Time to retrieve receiver in outgoing payment'
         }
       )
-      const receiver = await deps.receiverService.get(
-        payment.receiver
-      )
+      const receiver = await deps.receiverService.get(payment.receiver)
       stopTimerReceiver()
       if (!receiver) {
         throw OutgoingPaymentError.InvalidQuote

diff --git a/packages/backend/src/open_payments/quote/routes.test.ts b/packages/backend/src/open_payments/quote/routes.test.ts
@@ -47,7 +47,7 @@ describe('Quote Routes', (): void => {
     walletAddressId,
     client
   }: {
-    tenantId: string,
+    tenantId: string
     walletAddressId: string
     client?: string
   }): Promise<Quote> => {
@@ -78,7 +78,7 @@ describe('Quote Routes', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    tenant = await createTenant(deps) 
+    tenant = await createTenant(deps)
     const { id: assetId } = await createAsset(deps, {
       code: debitAmount.assetCode,
       scale: debitAmount.assetScale

diff --git a/packages/backend/src/open_payments/quote/service.test.ts b/packages/backend/src/open_payments/quote/service.test.ts
@@ -93,9 +93,7 @@ describe('QuoteService', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    tenantId = ( 
-      await createTenant(deps) 
-    ).id
+    tenantId = (await createTenant(deps)).id
     const { id: sendAssetId } = await createAsset(deps, {
       code: debitAmount.assetCode,
       scale: debitAmount.assetScale

diff --git a/packages/backend/src/open_payments/quote/service.ts b/packages/backend/src/open_payments/quote/service.ts
@@ -102,9 +102,7 @@ async function createQuote(
     callName: 'QuoteService:create',
     description: 'Time to create a quote'
   })
-  const tenant = await deps.tenantService.get(
-    options.tenantId
-  )
+  const tenant = await deps.tenantService.get(options.tenantId)
   if (!tenant) {
     stopTimer()
     return QuoteError.InvalidTenant
@@ -263,9 +261,7 @@ export async function resolveReceiver(
   deps: ServiceDependencies,
   options: CreateQuoteOptions
 ): Promise<Receiver> {
-  const receiver = await deps.receiverService.get(
-    options.receiver
-  )
+  const receiver = await deps.receiverService.get(options.receiver)
   if (!receiver) {
     deps.logger.info(
       { receiver: options.receiver },

diff --git a/packages/backend/src/open_payments/receiver/service.ts b/packages/backend/src/open_payments/receiver/service.ts
@@ -136,7 +136,7 @@ async function createLocalIncomingPayment(
 
 async function getReceiver(
   deps: ServiceDependencies,
-  url: string,
+  url: string
 ): Promise<Receiver | undefined> {
   const stopTimer = deps.telemetry.startTimer('getReceiver', {
     callName: 'ReceiverService:get'
@@ -148,10 +148,7 @@ async function getReceiver(
       return receiver
     }
 
-    const remoteIncomingPayment = await getRemoteIncomingPayment(
-      deps,
-      url
-    )
+    const remoteIncomingPayment = await getRemoteIncomingPayment(deps, url)
     if (remoteIncomingPayment) {
       const receiver = new Receiver(remoteIncomingPayment, false)
       return receiver
@@ -223,11 +220,10 @@ export async function getLocalIncomingPayment(
 
 async function getRemoteIncomingPayment(
   deps: ServiceDependencies,
-  url: string,
+  url: string
 ): Promise<OpenPaymentsIncomingPaymentWithPaymentMethods | undefined> {
-  const incomingPaymentOrError = await deps.remoteIncomingPaymentService.get(
-    url
-  )
+  const incomingPaymentOrError =
+    await deps.remoteIncomingPaymentService.get(url)
 
   if (isRemoteIncomingPaymentError(incomingPaymentOrError)) {
     return undefined

diff --git a/packages/backend/src/payment-method/handler/service.test.ts b/packages/backend/src/payment-method/handler/service.test.ts
@@ -46,7 +46,7 @@ describe('PaymentMethodHandlerService', (): void => {
 
   describe('getQuote', (): void => {
     test('calls ilpPaymentService for ILP payment type', async (): Promise<void> => {
-      const tenantId = ( await createTenant(deps) ).id
+      const tenantId = (await createTenant(deps)).id
       const asset = await createAsset(deps)
       const walletAddress = await createWalletAddress(deps, {
         assetId: asset.id
@@ -76,7 +76,7 @@ describe('PaymentMethodHandlerService', (): void => {
       )
     })
     test('calls localPaymentService for local payment type', async (): Promise<void> => {
-      const tenantId = ( await createTenant(deps) ).id
+      const tenantId = (await createTenant(deps)).id
       const asset = await createAsset(deps)
       const walletAddress = await createWalletAddress(deps, {
         assetId: asset.id
@@ -108,7 +108,7 @@ describe('PaymentMethodHandlerService', (): void => {
 
   describe('pay', (): void => {
     test('calls ilpPaymentService for ILP payment type', async (): Promise<void> => {
-      const tenantId = ( await createTenant(deps) ).id
+      const tenantId = (await createTenant(deps)).id
       const asset = await createAsset(deps)
       const walletAddress = await createWalletAddress(deps, {
         assetId: asset.id
@@ -144,7 +144,7 @@ describe('PaymentMethodHandlerService', (): void => {
       expect(ilpPaymentServicePaySpy).toHaveBeenCalledWith(options)
     })
     test('calls localPaymentService for local payment type', async (): Promise<void> => {
-      const tenantId = ( await createTenant(deps) ).id
+      const tenantId = (await createTenant(deps)).id
       const asset = await createAsset(deps)
       const walletAddress = await createWalletAddress(deps, {
         assetId: asset.id

diff --git a/packages/backend/src/payment-method/local/service.test.ts b/packages/backend/src/payment-method/local/service.test.ts
@@ -24,7 +24,6 @@ import { IncomingPaymentService } from '../../open_payments/payment/incoming/ser
 import { errorToMessage, TransferError } from '../../accounting/errors'
 import { PaymentMethodHandlerError } from '../handler/errors'
 import { ConvertError } from '../../rates/service'
-import { v4 as uuid } from 'uuid'
 import { createTenant } from '../../tests/tenant'
 
 const nock = (global as unknown as { nock: typeof import('nock') }).nock
@@ -56,7 +55,7 @@ describe('LocalPaymentService', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    tenantId = ( await createTenant(deps) ).id
+    tenantId = (await createTenant(deps)).id
     assetMap['USD'] = await createAsset(deps, {
       code: 'USD',
       scale: 2

diff --git a/packages/backend/src/shared/pagination.test.ts b/packages/backend/src/shared/pagination.test.ts
@@ -84,7 +84,7 @@ describe('Pagination', (): void => {
         outgoingPaymentService = await deps.use('outgoingPaymentService')
         quoteService = await deps.use('quoteService')
 
-        tenantId = (await createTenant(deps) ).id
+        tenantId = (await createTenant(deps)).id
         const asset = await createAsset(deps)
         defaultWalletAddress = await createWalletAddress(deps, {
           assetId: asset.id

diff --git a/packages/backend/src/tests/outgoingPayment.ts b/packages/backend/src/tests/outgoingPayment.ts
@@ -132,8 +132,7 @@ export async function createOutgoingPaymentWithReceiver(
 
   const outgoingPayment = await createOutgoingPayment(deps, {
     //TODO fix this in outgoing payments changes
-    tenantId:
-      args.quoteOptions?.tenantId || uuid(),
+    tenantId: args.quoteOptions?.tenantId || uuid(),
     walletAddressId: args.sendingWalletAddress.id,
     method: args.method,
     receiver: receiver.incomingPayment!.id!,

diff --git a/packages/backend/src/webhook/service.test.ts b/packages/backend/src/webhook/service.test.ts
@@ -118,7 +118,7 @@ describe('Webhook Service', (): void => {
     let events: WebhookEvent[] = []
 
     beforeEach(async (): Promise<void> => {
-      tenantId = ( await createTenant(deps) ).id
+      tenantId = (await createTenant(deps)).id
       walletAddressIn = await createWalletAddress(deps)
       walletAddressOut = await createWalletAddress(deps)
       incomingPaymentIds = [