Skip to content

Commit f1375f3

Browse files
authored
chore(backend): remove peer id from outgoing payment model (#3617)
* chore(backend): remove peer id from outgoing payment model * chore(backend): delete peer id from webhooks spec
1 parent 97178b5 commit f1375f3

File tree

9 files changed

+25
-51
lines changed

9 files changed

+25
-51
lines changed

bruno/collections/Rafiki/Sample Webhook Events/Outgoing Payment Completed.bru

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ body:json {
4141
"balance": "0",
4242
"metadata": {
4343
"description": "Free Money!"
44-
},
45-
"peerId": "f4b35b6f-7125-485f-8a28-48367ad42557"
44+
}
4645
}
4746
}
4847
}

bruno/collections/Rafiki/Sample Webhook Events/Outgoing Payment Created.bru

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ body:json {
4141
"balance": "2",
4242
"metadata": {
4343
"description": "Free Money!"
44-
},
45-
"peerId": "f4b35b6f-7125-485f-8a28-48367ad42557"
44+
}
4645
}
4746
}
4847
}

bruno/collections/Rafiki/Sample Webhook Events/Outgoing Payment Failed.bru

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ body:json {
4141
"balance": "52",
4242
"metadata": {
4343
"description": "Free Money!"
44-
},
45-
"peerId": "f4b35b6f-7125-485f-8a28-48367ad42557"
44+
}
4645
}
4746
}
4847
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* @param { import("knex").Knex } knex
3+
* @returns { Promise<void> }
4+
*/
5+
exports.up = function (knex) {
6+
return knex.schema.alterTable('outgoingPayments', function (table) {
7+
table.dropForeign(['peerId'])
8+
table.dropColumn('peerId')
9+
})
10+
}
11+
12+
/**
13+
* @param { import("knex").Knex } knex
14+
* @returns { Promise<void> }
15+
*/
16+
exports.down = function (knex) {
17+
return knex.schema.alterTable('outgoingPayments', function (table) {
18+
table.uuid('peerId').nullable()
19+
table.foreign('peerId').references('peers.id')
20+
})
21+
}

packages/backend/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,6 @@ export function initIocContainer(
662662
paymentMethodHandlerService: await deps.use(
663663
'paymentMethodHandlerService'
664664
),
665-
peerService: await deps.use('peerService'),
666665
walletAddressService: await deps.use('walletAddressService'),
667666
quoteService: await deps.use('quoteService'),
668667
assetService: await deps.use('assetService'),

packages/backend/src/open_payments/payment/outgoing/model.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ export class OutgoingPayment
123123
].includes(this.state)
124124
}
125125

126-
// Outgoing peer
127-
public peerId?: string
128-
129126
public tenantId!: string
130127

131128
static get relationMappings() {
@@ -194,9 +191,6 @@ export class OutgoingPayment
194191
if (this.error) {
195192
data.error = this.error
196193
}
197-
if (this.peerId) {
198-
data.peerId = this.peerId
199-
}
200194

201195
if (this.grantId) {
202196
data.grantId = this.grantId
@@ -287,7 +281,6 @@ export type PaymentData = Omit<OutgoingPaymentResponse, 'failed'> & {
287281
state: OutgoingPaymentState
288282
stateAttempts: number
289283
balance: string
290-
peerId?: string
291284
grantId?: string
292285
}
293286

packages/backend/src/open_payments/payment/outgoing/service.test.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -910,8 +910,7 @@ describe('OutgoingPaymentService', (): void => {
910910
receiveAmount: quote.receiveAmount,
911911
metadata: options.metadata,
912912
state: OutgoingPaymentState.Funding,
913-
asset: quote.asset,
914-
peerId: outgoingPeer ? peer.id : null
913+
asset: quote.asset
915914
})
916915

917916
await expect(
@@ -924,9 +923,6 @@ describe('OutgoingPaymentService', (): void => {
924923
id: payment.id,
925924
client: payment.client
926925
}
927-
if (outgoingPeer) {
928-
expectedPaymentData.peerId = peer.id
929-
}
930926
await expect(
931927
OutgoingPaymentEvent.query(knex).where({
932928
type: OutgoingPaymentEventType.PaymentCreated

packages/backend/src/open_payments/payment/outgoing/service.ts

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
AccountingService,
2424
LiquidityAccountType
2525
} from '../../../accounting/service'
26-
import { PeerService } from '../../../payment-method/ilp/peer/service'
2726
import { ReceiverService } from '../../receiver/service'
2827
import { GetOptions, ListOptions } from '../../wallet_address/model'
2928
import {
@@ -67,7 +66,6 @@ export interface ServiceDependencies extends BaseService {
6766
knex: TransactionOrKnex
6867
accountingService: AccountingService
6968
receiverService: ReceiverService
70-
peerService: PeerService
7169
paymentMethodHandlerService: PaymentMethodHandlerService
7270
walletAddressService: WalletAddressService
7371
quoteService: QuoteService
@@ -346,23 +344,6 @@ async function createOutgoingPayment(
346344
if (!receiver || !receiver.isActive()) {
347345
throw OutgoingPaymentError.InvalidQuote
348346
}
349-
const stopTimerPeer = deps.telemetry.startTimer(
350-
'outgoing_payment_service_getpeer_time_ms',
351-
{
352-
callName: 'PeerService:getByDestinationAddress',
353-
description: 'Time to retrieve peer in outgoing payment'
354-
}
355-
)
356-
const ilpPaymentMethod = receiver.paymentMethods.find(
357-
(method) => method.type === 'ilp'
358-
)
359-
const peer = ilpPaymentMethod
360-
? await deps.peerService.getByDestinationAddress(
361-
ilpPaymentMethod.ilpAddress,
362-
tenantId
363-
)
364-
: undefined
365-
stopTimerPeer()
366347

367348
const payment = await OutgoingPayment.transaction(async (trx) => {
368349
if (grantId) {
@@ -434,16 +415,6 @@ async function createOutgoingPayment(
434415
}
435416
}
436417

437-
const stopTimerPeerUpdate = deps.telemetry.startTimer(
438-
'outgoing_payment_service_patchpeer_time_ms',
439-
{
440-
callName: 'OutgoingPaymentModel:patch',
441-
description: 'Time to patch peer in outgoing payment'
442-
}
443-
)
444-
if (peer) await payment.$query(trx).patch({ peerId: peer.id })
445-
stopTimerPeerUpdate()
446-
447418
const stopTimerWebhook = deps.telemetry.startTimer(
448419
'outgoing_payment_service_webhook_event_time_ms',
449420
{

packages/backend/src/openapi/specs/webhooks.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,6 @@ components:
239239
balance:
240240
type: string
241241
format: uint64
242-
peerId:
243-
type: string
244-
format: uuid
245242
grantId:
246243
type: string
247244
format: uuid

0 commit comments

Comments
 (0)