feat(quote): remove internal fields from schema (#2858)

* feat(quote): remote internaly used fields * test(quote): remove removed fields from resolvers response * docs(bruno): remove internal fields * feat(quote): add estimatedExchangeRate field * docs(bruno): add estimatedExchangeRate to quote query * feat(lint): everything * fix(incoming-payment): service test * fix(bruno): remove deprecated internal quote fields
interledger · Aug 20, 2024 · 8e96bc3 · 8e96bc3
1 parent 3fd3b90
commit 8e96bc3
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 187 deletions.
diff --git a/...i/Examples/Admin API - only locally/Peer-to-Peer Cross Currency Payment/Create Quote.bru b/...i/Examples/Admin API - only locally/Peer-to-Peer Cross Currency Payment/Create Quote.bru
@@ -16,11 +16,7 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
         receiveAmount {
           assetCode

diff --git a/...llections/Rafiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Create Quote.bru b/...llections/Rafiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Create Quote.bru
@@ -16,11 +16,7 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
         receiveAmount {
           assetCode

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Cancel Outgoing Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Cancel Outgoing Payment.bru
@@ -22,11 +22,8 @@ body:graphql {
         quote {
           createdAt
           expiresAt
-          highEstimatedExchangeRate
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
+          estimatedExchangeRate
           walletAddressId
           receiveAmount {
             assetCode

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment From Incoming Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment From Incoming Payment.bru
@@ -22,12 +22,9 @@ body:graphql {
         quote {
           createdAt
           expiresAt
-          highEstimatedExchangeRate
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
           walletAddressId
+          estimatedExchangeRate
           receiveAmount {
             assetCode
             assetScale

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment.bru
@@ -22,11 +22,8 @@ body:graphql {
         quote {
           createdAt
           expiresAt
-          highEstimatedExchangeRate
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
+          estimatedExchangeRate
           walletAddressId
           receiveAmount {
             assetCode

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Quote.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Quote.bru
@@ -16,11 +16,7 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
         receiveAmount {
           assetCode

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Get Outgoing Payment.bru
@@ -23,12 +23,9 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
+        estimatedExchangeRate
         receiveAmount {
           assetCode
           assetScale

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Get Quote.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Get Quote.bru
@@ -14,13 +14,10 @@ body:graphql {
   query GetQuote($id: String!) {
       quote(id: $id) {
           createdAt
-          highEstimatedExchangeRate
           expiresAt
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
           walletAddressId
+          estimatedExchangeRate
           receiveAmount {
               assetCode
               assetScale

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/outgoing_payment.test.ts b/packages/backend/src/graphql/resolvers/outgoing_payment.test.ts
@@ -198,10 +198,7 @@ describe('OutgoingPayment Resolvers', (): void => {
                     metadata
                     quote {
                       id
-                      maxPacketAmount
-                      minExchangeRate
-                      lowEstimatedExchangeRate
-                      highEstimatedExchangeRate
+                      estimatedExchangeRate
                       createdAt
                       expiresAt
                     }
@@ -245,14 +242,11 @@ describe('OutgoingPayment Resolvers', (): void => {
             metadata,
             quote: {
               id: payment.quote.id,
-              maxPacketAmount: payment.quote.maxPacketAmount.toString(),
-              minExchangeRate: payment.quote.minExchangeRate.valueOf(),
-              lowEstimatedExchangeRate:
-                payment.quote.lowEstimatedExchangeRate.valueOf(),
-              highEstimatedExchangeRate:
-                payment.quote.highEstimatedExchangeRate.valueOf(),
               createdAt: payment.quote.createdAt.toISOString(),
               expiresAt: payment.quote.expiresAt.toISOString(),
+              estimatedExchangeRate: payment.quote.estimatedExchangeRate
+                ? parseFloat(payment.quote.estimatedExchangeRate?.toString())
+                : undefined,
               __typename: 'Quote'
             },
             createdAt: payment.createdAt.toISOString(),

diff --git a/packages/backend/src/graphql/resolvers/quote.test.ts b/packages/backend/src/graphql/resolvers/quote.test.ts
@@ -93,10 +93,6 @@ describe('Quote Resolvers', (): void => {
                   assetCode
                   assetScale
                 }
-                maxPacketAmount
-                minExchangeRate
-                lowEstimatedExchangeRate
-                highEstimatedExchangeRate
                 createdAt
                 expiresAt
               }
@@ -124,10 +120,6 @@ describe('Quote Resolvers', (): void => {
           assetScale: quote.receiveAmount.assetScale,
           __typename: 'Amount'
         },
-        maxPacketAmount: quote.maxPacketAmount.toString(),
-        minExchangeRate: quote.minExchangeRate.valueOf(),
-        lowEstimatedExchangeRate: quote.lowEstimatedExchangeRate.valueOf(),
-        highEstimatedExchangeRate: quote.highEstimatedExchangeRate.valueOf(),
         createdAt: quote.createdAt.toISOString(),
         expiresAt: quote.expiresAt.toISOString(),
         __typename: 'Quote'

diff --git a/packages/backend/src/graphql/resolvers/quote.ts b/packages/backend/src/graphql/resolvers/quote.ts
@@ -104,11 +104,8 @@ export function quoteToGraphql(quote: Quote): SchemaQuote {
     receiver: quote.receiver,
     debitAmount: quote.debitAmount,
     receiveAmount: quote.receiveAmount,
-    maxPacketAmount: quote.maxPacketAmount,
-    minExchangeRate: quote.minExchangeRate.valueOf(),
-    lowEstimatedExchangeRate: quote.lowEstimatedExchangeRate.valueOf(),
-    highEstimatedExchangeRate: quote.highEstimatedExchangeRate.valueOf(),
     createdAt: new Date(+quote.createdAt).toISOString(),
-    expiresAt: new Date(+quote.expiresAt).toISOString()
+    expiresAt: new Date(+quote.expiresAt).toISOString(),
+    estimatedExchangeRate: quote.estimatedExchangeRate?.valueOf()
   }
 }
diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql
@@ -957,18 +957,12 @@ type Quote {
   debitAmount: Amount!
   "Amount to receive (fixed receive)"
   receiveAmount: Amount!
-  "Maximum value per packet allowed on the possible routes"
-  maxPacketAmount: UInt64!
-  "Aggregate exchange rate the payment is guaranteed to meet"
-  minExchangeRate: Float!
-  "Lower bound of probed exchange rate"
-  lowEstimatedExchangeRate: Float!
-  "Upper bound of probed exchange rate"
-  highEstimatedExchangeRate: Float!
   "Date-time of creation"
   createdAt: String!
   "Date-time of expiration"
   expiresAt: String!
+  "Estimated exchange rate"
+  estimatedExchangeRate: Float
 }
 
 input AmountInput {

diff --git a/packages/frontend/app/generated/graphql.ts b/packages/frontend/app/generated/graphql.ts