Skip to content

Refactor Payments Code (Head PR for refactor to make sure the itest pass) #9822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Refactor Payments Code (Head PR for refactor to make sure the itest pass) #9822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions channeldb/duplicate_payments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
pymtpkg "github.com/lightningnetwork/lnd/payments"
"github.com/lightningnetwork/lnd/routing/route"
)

Expand Down Expand Up @@ -61,20 +62,20 @@ type duplicateHTLCAttemptInfo struct {

// fetchDuplicatePaymentStatus fetches the payment status of the payment. If
// the payment isn't found, it will return error `ErrPaymentNotInitiated`.
func fetchDuplicatePaymentStatus(bucket kvdb.RBucket) (PaymentStatus, error) {
func fetchDuplicatePaymentStatus(bucket kvdb.RBucket) (pymtpkg.PaymentStatus, error) {
if bucket.Get(duplicatePaymentSettleInfoKey) != nil {
return StatusSucceeded, nil
return pymtpkg.StatusSucceeded, nil
}

if bucket.Get(duplicatePaymentFailInfoKey) != nil {
return StatusFailed, nil
return pymtpkg.StatusFailed, nil
}

if bucket.Get(duplicatePaymentCreationInfoKey) != nil {
return StatusInFlight, nil
return pymtpkg.StatusInFlight, nil
}

return 0, ErrPaymentNotInitiated
return 0, pymtpkg.ErrPaymentNotInitiated
}

func deserializeDuplicateHTLCAttemptInfo(r io.Reader) (
Expand All @@ -93,11 +94,11 @@ func deserializeDuplicateHTLCAttemptInfo(r io.Reader) (
}

func deserializeDuplicatePaymentCreationInfo(r io.Reader) (
*PaymentCreationInfo, error) {
*pymtpkg.PaymentCreationInfo, error) {

var scratch [8]byte

c := &PaymentCreationInfo{}
c := &pymtpkg.PaymentCreationInfo{}

if _, err := io.ReadFull(r, c.PaymentIdentifier[:]); err != nil {
return nil, err
Expand Down Expand Up @@ -129,7 +130,7 @@ func deserializeDuplicatePaymentCreationInfo(r io.Reader) (
return c, nil
}

func fetchDuplicatePayment(bucket kvdb.RBucket) (*MPPayment, error) {
func fetchDuplicatePayment(bucket kvdb.RBucket) (*pymtpkg.MPPayment, error) {
seqBytes := bucket.Get(duplicatePaymentSequenceKey)
if seqBytes == nil {
return nil, fmt.Errorf("sequence number not found")
Expand All @@ -156,14 +157,14 @@ func fetchDuplicatePayment(bucket kvdb.RBucket) (*MPPayment, error) {
}

// Get failure reason if available.
var failureReason *FailureReason
var failureReason *pymtpkg.FailureReason
b = bucket.Get(duplicatePaymentFailInfoKey)
if b != nil {
reason := FailureReason(b[0])
reason := pymtpkg.FailureReason(b[0])
failureReason = &reason
}

payment := &MPPayment{
payment := &pymtpkg.MPPayment{
SequenceNum: sequenceNum,
Info: creationInfo,
FailureReason: failureReason,
Expand All @@ -179,13 +180,14 @@ func fetchDuplicatePayment(bucket kvdb.RBucket) (*MPPayment, error) {
return nil, err
}

htlc := HTLCAttempt{
HTLCAttemptInfo: HTLCAttemptInfo{
AttemptID: attempt.attemptID,
Route: attempt.route,
sessionKey: attempt.sessionKey,
htlc := pymtpkg.HTLCAttempt{
HTLCAttemptInfo: pymtpkg.HTLCAttemptInfo{
AttemptID: attempt.attemptID,
Route: attempt.route,
},
}
// Set the session key for the HTLC attempt.
htlc.SetSessionKey(attempt.sessionKey)

// Get the payment preimage. This is only found for
// successful payments.
Expand All @@ -194,27 +196,27 @@ func fetchDuplicatePayment(bucket kvdb.RBucket) (*MPPayment, error) {
var preimg lntypes.Preimage
copy(preimg[:], b)

htlc.Settle = &HTLCSettleInfo{
htlc.Settle = &pymtpkg.HTLCSettleInfo{
Preimage: preimg,
SettleTime: time.Time{},
}
} else {
// Otherwise the payment must have failed.
htlc.Failure = &HTLCFailInfo{
htlc.Failure = &pymtpkg.HTLCFailInfo{
FailTime: time.Time{},
}
}

payment.HTLCs = []HTLCAttempt{htlc}
payment.HTLCs = []pymtpkg.HTLCAttempt{htlc}
}

return payment, nil
}

func fetchDuplicatePayments(paymentHashBucket kvdb.RBucket) ([]*MPPayment,
func fetchDuplicatePayments(paymentHashBucket kvdb.RBucket) ([]*pymtpkg.MPPayment,
error) {

var payments []*MPPayment
var payments []*pymtpkg.MPPayment

// For older versions of lnd, duplicate payments to a payment has was
// possible. These will be found in a sub-bucket indexed by their
Expand Down
Loading
Loading