From 7547c234ccc372b1deb3ced9a5bcb683b46ca98c Mon Sep 17 00:00:00 2001 From: Calvin Zachman Date: Tue, 27 Aug 2024 19:00:58 -0500 Subject: [PATCH] routing: export dbMPPayment interface This will assist external programs attempting to re-use ChannelRouter code and leverage the ControlTower's FetchPayment method. --- routing/control_tower.go | 8 ++++---- routing/mock_test.go | 6 +++--- routing/payment_lifecycle.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/routing/control_tower.go b/routing/control_tower.go index 274c4190b..8968ca312 100644 --- a/routing/control_tower.go +++ b/routing/control_tower.go @@ -9,9 +9,9 @@ import ( "github.com/lightningnetwork/lnd/queue" ) -// dbMPPayment is an interface derived from channeldb.MPPayment that is used by +// DBMPPayment is an interface derived from channeldb.MPPayment that is used by // the payment lifecycle. -type dbMPPayment interface { +type DBMPPayment interface { // GetState returns the current state of the payment. GetState() *channeldb.MPPaymentState @@ -76,7 +76,7 @@ type ControlTower interface { // FetchPayment fetches the payment corresponding to the given payment // hash. - FetchPayment(paymentHash lntypes.Hash) (dbMPPayment, error) + FetchPayment(paymentHash lntypes.Hash) (DBMPPayment, error) // FailPayment transitions a payment into the Failed state, and records // the ultimate reason the payment failed. Note that this should only @@ -273,7 +273,7 @@ func (p *controlTower) FailAttempt(paymentHash lntypes.Hash, // FetchPayment fetches the payment corresponding to the given payment hash. func (p *controlTower) FetchPayment(paymentHash lntypes.Hash) ( - dbMPPayment, error) { + DBMPPayment, error) { return p.db.FetchPayment(paymentHash) } diff --git a/routing/mock_test.go b/routing/mock_test.go index 306c18210..5789f1a82 100644 --- a/routing/mock_test.go +++ b/routing/mock_test.go @@ -504,7 +504,7 @@ func (m *mockControlTowerOld) FailPayment(phash lntypes.Hash, } func (m *mockControlTowerOld) FetchPayment(phash lntypes.Hash) ( - dbMPPayment, error) { + DBMPPayment, error) { m.Lock() defer m.Unlock() @@ -776,7 +776,7 @@ func (m *mockControlTower) FailPayment(phash lntypes.Hash, } func (m *mockControlTower) FetchPayment(phash lntypes.Hash) ( - dbMPPayment, error) { + DBMPPayment, error) { args := m.Called(phash) @@ -814,7 +814,7 @@ type mockMPPayment struct { mock.Mock } -var _ dbMPPayment = (*mockMPPayment)(nil) +var _ DBMPPayment = (*mockMPPayment)(nil) func (m *mockMPPayment) GetState() *channeldb.MPPaymentState { args := m.Called() diff --git a/routing/payment_lifecycle.go b/routing/payment_lifecycle.go index 5244d4d63..b788b1263 100644 --- a/routing/payment_lifecycle.go +++ b/routing/payment_lifecycle.go @@ -109,7 +109,7 @@ const ( // decideNextStep is used to determine the next step in the payment lifecycle. func (p *paymentLifecycle) decideNextStep( - payment dbMPPayment) (stateStep, error) { + payment DBMPPayment) (stateStep, error) { // Check whether we could make new HTLC attempts. allow, err := payment.AllowMoreAttempts()