feat(backend): add method to quote create paths

interledger · Oct 20, 2023 · 6f3e16e · 6f3e16e
1 parent 8396970
commit 6f3e16e
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 39 deletions.
diff --git a/packages/backend/src/graphql/resolvers/quote.test.ts b/packages/backend/src/graphql/resolvers/quote.test.ts
@@ -58,6 +58,7 @@ describe('Quote Resolvers', (): void => {
         assetCode: asset.code,
         assetScale: asset.scale
       },
+      method: 'ilp',
       validDestination: false
     })
   }
@@ -217,7 +218,8 @@ describe('Quote Resolvers', (): void => {
         })
         .then((query): QuoteResponse => query.data?.createQuote)
 
-      expect(createSpy).toHaveBeenCalledWith(input)
+      console.log(createSpy.mock.calls[0])
+      expect(createSpy).toHaveBeenCalledWith({ ...input, method: 'ilp' })
       expect(query.code).toBe('200')
       expect(query.success).toBe(true)
       expect(query.quote?.id).toBe(quote?.id)
@@ -271,7 +273,7 @@ describe('Quote Resolvers', (): void => {
           variables: { input }
         })
         .then((query): QuoteResponse => query.data?.createQuote)
-      expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith({ ...input, method: 'ilp' })
       expect(query.code).toBe('500')
       expect(query.success).toBe(false)
       expect(query.message).toBe('Error trying to create quote')

diff --git a/packages/backend/src/graphql/resolvers/quote.ts b/packages/backend/src/graphql/resolvers/quote.ts
@@ -35,7 +35,8 @@ export const createQuote: MutationResolvers<ApolloContext>['createQuote'] =
     const quoteService = await ctx.container.use('quoteService')
     const options: CreateQuoteOptions = {
       walletAddressId: args.input.walletAddressId,
-      receiver: args.input.receiver
+      receiver: args.input.receiver,
+      method: 'ilp'
     }
     if (args.input.debitAmount) options.debitAmount = args.input.debitAmount
     if (args.input.receiveAmount)

diff --git a/packages/backend/src/open_payments/payment/outgoing/service.test.ts b/packages/backend/src/open_payments/payment/outgoing/service.test.ts
@@ -337,7 +337,8 @@ describe('OutgoingPaymentService', (): void => {
             const quote = await createQuote(deps, {
               walletAddressId,
               receiver,
-              debitAmount
+              debitAmount,
+              method: 'ilp'
             })
             const options = {
               walletAddressId,
@@ -400,7 +401,8 @@ describe('OutgoingPaymentService', (): void => {
           walletAddressId,
           receiver,
           debitAmount,
-          validDestination: false
+          validDestination: false,
+          method: 'ilp'
         })
         await expect(
           outgoingPaymentService.create({
@@ -438,7 +440,8 @@ describe('OutgoingPaymentService', (): void => {
           walletAddressId,
           receiver,
           debitAmount,
-          validDestination: false
+          validDestination: false,
+          method: 'ilp'
         })
         await expect(
           outgoingPaymentService.create({
@@ -453,7 +456,8 @@ describe('OutgoingPaymentService', (): void => {
           walletAddressId,
           receiver,
           debitAmount,
-          validDestination: false
+          validDestination: false,
+          method: 'ilp'
         })
         await quote.$query(knex).patch({
           expiresAt: new Date()
@@ -475,7 +479,8 @@ describe('OutgoingPaymentService', (): void => {
           const quote = await createQuote(deps, {
             walletAddressId,
             receiver,
-            debitAmount
+            debitAmount,
+            method: 'ilp'
           })
           await incomingPayment.$query(knex).patch({
             state,
@@ -496,7 +501,8 @@ describe('OutgoingPaymentService', (): void => {
           walletAddressId,
           receiver,
           debitAmount,
-          validDestination: false
+          validDestination: false,
+          method: 'ilp'
         })
         const walletAddress = await createWalletAddress(deps)
         const walletAddressUpdated = await WalletAddress.query(
@@ -523,7 +529,8 @@ describe('OutgoingPaymentService', (): void => {
               return await createQuote(deps, {
                 walletAddressId,
                 receiver,
-                debitAmount
+                debitAmount,
+                method: 'ilp'
               })
             })
           )
@@ -571,7 +578,8 @@ describe('OutgoingPaymentService', (): void => {
             quote = await createQuote(deps, {
               walletAddressId,
               receiver,
-              debitAmount
+              debitAmount,
+              method: 'ilp'
             })
             options = {
               walletAddressId,
@@ -831,7 +839,8 @@ describe('OutgoingPaymentService', (): void => {
       const paymentId = await setup({
         receiver,
         debitAmount,
-        receiveAmount
+        receiveAmount,
+        method: 'ilp'
       })
 
       const payment = await processNext(
@@ -860,7 +869,8 @@ describe('OutgoingPaymentService', (): void => {
       assert.ok(incomingPayment.walletAddress)
       const paymentId = await setup({
         receiver: incomingPayment.getUrl(incomingPayment.walletAddress),
-        receiveAmount
+        receiveAmount,
+        method: 'ilp'
       })
 
       const payment = await processNext(
@@ -881,7 +891,8 @@ describe('OutgoingPaymentService', (): void => {
       const paymentId = await setup(
         {
           receiver,
-          receiveAmount
+          receiveAmount,
+          method: 'ilp'
         },
         receiveAmount
       )
@@ -924,7 +935,8 @@ describe('OutgoingPaymentService', (): void => {
 
       const paymentId = await setup({
         receiver,
-        debitAmount
+        debitAmount,
+        method: 'ilp'
       })
 
       for (let i = 0; i < 4; i++) {
@@ -966,7 +978,8 @@ describe('OutgoingPaymentService', (): void => {
       )
       const paymentId = await setup({
         receiver,
-        debitAmount
+        debitAmount,
+        method: 'ilp'
       })
 
       const payment = await processNext(
@@ -992,7 +1005,8 @@ describe('OutgoingPaymentService', (): void => {
       )
       const paymentId = await setup({
         receiver,
-        receiveAmount
+        receiveAmount,
+        method: 'ilp'
       })
 
       const payment = await processNext(paymentId, OutgoingPaymentState.Sending)
@@ -1022,7 +1036,8 @@ describe('OutgoingPaymentService', (): void => {
       const paymentId = await setup(
         {
           receiver,
-          receiveAmount
+          receiveAmount,
+          method: 'ilp'
         },
         receiveAmount
       )
@@ -1048,7 +1063,8 @@ describe('OutgoingPaymentService', (): void => {
       const paymentId = await setup(
         {
           receiver,
-          receiveAmount
+          receiveAmount,
+          method: 'ilp'
         },
         receiveAmount
       )
@@ -1071,7 +1087,8 @@ describe('OutgoingPaymentService', (): void => {
     it('FAILED (source asset changed)', async (): Promise<void> => {
       const paymentId = await setup({
         receiver,
-        debitAmount
+        debitAmount,
+        method: 'ilp'
       })
       const { id: assetId } = await createAsset(deps, {
         code: asset.code,
@@ -1091,7 +1108,8 @@ describe('OutgoingPaymentService', (): void => {
     it('FAILED (destination asset changed)', async (): Promise<void> => {
       const paymentId = await setup({
         receiver,
-        debitAmount
+        debitAmount,
+        method: 'ilp'
       })
       // Pretend that the destination asset was initially different.
       await OutgoingPayment.relatedQuery('quote')

diff --git a/packages/backend/src/open_payments/quote/routes.test.ts b/packages/backend/src/open_payments/quote/routes.test.ts
@@ -53,6 +53,7 @@ describe('Quote Routes', (): void => {
         assetCode: asset.code,
         assetScale: asset.scale
       },
+      method: 'ilp',
       client,
       validDestination: false
     })
@@ -137,7 +138,8 @@ describe('Quote Routes', (): void => {
           ...debitAmount,
           value: debitAmount.value.toString(),
           assetScale: debitAmount.assetScale + 1
-        }
+        },
+        method: 'ilp'
       }
       const ctx = setup({})
       await expect(quoteRoutes.create(ctx)).rejects.toMatchObject({
@@ -170,7 +172,8 @@ describe('Quote Routes', (): void => {
         '$description',
         async ({ debitAmount, receiveAmount }): Promise<void> => {
           options = {
-            receiver
+            receiver,
+            method: 'ilp'
           }
           if (debitAmount)
             options.debitAmount = {
@@ -208,7 +211,8 @@ describe('Quote Routes', (): void => {
               ...options.receiveAmount,
               value: BigInt(options.receiveAmount.value)
             },
-            client
+            client,
+            method: 'ilp'
           })
           expect(ctx.response).toSatisfyApiSpec()
           const quoteId = (
@@ -238,7 +242,8 @@ describe('Quote Routes', (): void => {
 
       test('receiver.incomingAmount', async (): Promise<void> => {
         options = {
-          receiver
+          receiver,
+          method: 'ilp'
         }
         const ctx = setup({ client })
         let quote: Quote | undefined
@@ -256,7 +261,8 @@ describe('Quote Routes', (): void => {
         expect(quoteSpy).toHaveBeenCalledWith({
           walletAddressId: walletAddress.id,
           receiver,
-          client
+          client,
+          method: 'ilp'
         })
         expect(ctx.response).toSatisfyApiSpec()
         const quoteId = (

diff --git a/packages/backend/src/open_payments/quote/routes.ts b/packages/backend/src/open_payments/quote/routes.ts
@@ -46,6 +46,7 @@ async function getQuote(
 
 interface CreateBodyBase {
   receiver: string
+  method: 'ilp'
 }
 
 interface CreateBodyWithDebitAmount extends CreateBodyBase {
@@ -68,7 +69,8 @@ async function createQuote(
   const options: CreateQuoteOptions = {
     walletAddressId: ctx.walletAddress.id,
     receiver: body.receiver,
-    client: ctx.client
+    client: ctx.client,
+    method: body.method
   }
   if (body.debitAmount) options.debitAmount = parseAmount(body.debitAmount)
   if (body.receiveAmount)

diff --git a/packages/backend/src/open_payments/quote/service.test.ts b/packages/backend/src/open_payments/quote/service.test.ts
@@ -113,7 +113,8 @@ describe('QuoteService', (): void => {
           },
           client,
           validDestination: false,
-          withFee: true
+          withFee: true,
+          method: 'ilp'
         }),
       get: (options) => quoteService.get(options),
       list: (options) => quoteService.getWalletAddressPage(options)
@@ -148,7 +149,8 @@ describe('QuoteService', (): void => {
           })
           options = {
             walletAddressId: sendingWalletAddress.id,
-            receiver: incomingPayment.getUrl(receivingWalletAddress)
+            receiver: incomingPayment.getUrl(receivingWalletAddress),
+            method: 'ilp'
           }
           if (debitAmount) options.debitAmount = debitAmount
           if (receiveAmount) options.receiveAmount = receiveAmount
@@ -342,7 +344,8 @@ describe('QuoteService', (): void => {
         const options: CreateQuoteOptions = {
           walletAddressId: sendingWalletAddress.id,
           receiver: incomingPayment.getUrl(receivingWalletAddress),
-          receiveAmount
+          receiveAmount,
+          method: 'ilp'
         }
 
         const mockedQuote = mockQuote({
@@ -383,7 +386,8 @@ describe('QuoteService', (): void => {
         quoteService.create({
           walletAddressId: uuid(),
           receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
-          debitAmount
+          debitAmount,
+          method: 'ilp'
         })
       ).resolves.toEqual(QuoteError.UnknownWalletAddress)
     })
@@ -398,7 +402,8 @@ describe('QuoteService', (): void => {
         quoteService.create({
           walletAddressId: walletAddress.id,
           receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
-          debitAmount
+          debitAmount,
+          method: 'ilp'
         })
       ).resolves.toEqual(QuoteError.InactiveWalletAddress)
     })
@@ -408,7 +413,8 @@ describe('QuoteService', (): void => {
         quoteService.create({
           walletAddressId: sendingWalletAddress.id,
           receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
-          debitAmount
+          debitAmount,
+          method: 'ilp'
         })
       ).resolves.toEqual(QuoteError.InvalidReceiver)
     })
@@ -430,7 +436,8 @@ describe('QuoteService', (): void => {
         })
         const options: CreateQuoteOptions = {
           walletAddressId: sendingWalletAddress.id,
-          receiver: incomingPayment.getUrl(receivingWalletAddress)
+          receiver: incomingPayment.getUrl(receivingWalletAddress),
+          method: 'ilp'
         }
         if (debitAmount) options.debitAmount = debitAmount
         if (receiveAmount) options.receiveAmount = receiveAmount
@@ -499,7 +506,8 @@ describe('QuoteService', (): void => {
 
           const quote = await quoteService.create({
             walletAddressId: sendingWalletAddress.id,
-            receiver: receiver.incomingPayment!.id
+            receiver: receiver.incomingPayment!.id,
+            method: 'ilp'
           })
           assert.ok(!isQuoteError(quote))
 
@@ -576,7 +584,8 @@ describe('QuoteService', (): void => {
               value: debitAmountValue,
               assetCode: sendAsset.code,
               assetScale: sendAsset.scale
-            }
+            },
+            method: 'ilp'
           })
           assert.ok(!isQuoteError(quote))
 

diff --git a/packages/backend/src/open_payments/quote/service.ts b/packages/backend/src/open_payments/quote/service.ts
@@ -56,6 +56,7 @@ async function getQuote(
 interface QuoteOptionsBase {
   walletAddressId: string
   receiver: string
+  method: 'ilp'
   client?: string
 }