mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 01:43:16 +01:00
Code Issues Projects Releases Wiki Activity

routing: make sure StatusInitiated is notified when creating payments

Browse Source 
This commit fixes `InitPayment` method to make sure the subscribers get
notified when new payments are created.
This commit is contained in:
yyforyongyu 2023-11-15 19:45:20 +08:00
parent 9e00799188
commit 9acbbf0ec7
No known key found for this signature in database
GPG Key ID: 9BCD95C4FF296868
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
routing/control_tower.go
View File

@ -181,12 +181,29 @@ func NewControlTower(db *channeldb.PaymentControl) ControlTower {
// InitPayment checks or records the given PaymentCreationInfo with the DB,
// making sure it does not already exist as an in-flight payment. Then this
// method returns successfully, the payment is guaranteed to be in the InFlight
// state.
// method returns successfully, the payment is guaranteed to be in the
// Initiated state.
func (p *controlTower) InitPayment(paymentHash lntypes.Hash,
info *channeldb.PaymentCreationInfo) error {
return p.db.InitPayment(paymentHash, info)
err := p.db.InitPayment(paymentHash, info)
if err != nil {
return err
}
// Take lock before querying the db to prevent missing or duplicating
// an update.
p.paymentsMtx.Lock(paymentHash)
defer p.paymentsMtx.Unlock(paymentHash)
payment, err := p.db.FetchPayment(paymentHash)
if err != nil {
return err
}
p.notifySubscribers(paymentHash, payment)
return nil
}
// DeleteFailedAttempts deletes all failed htlcs if the payment was

32
routing/control_tower_test.go
View File

@ -196,7 +196,7 @@ func TestPaymentControlSubscribeAllSuccess(t *testing.T) {
err = pControl.InitPayment(info1.PaymentIdentifier, info1)
require.NoError(t, err)
// Subscription should succeed and immediately report the InFlight
// Subscription should succeed and immediately report the Initiated
// status.
subscription, err := pControl.SubscribeAllPayments()
require.NoError(t, err, "expected subscribe to succeed, but got: %v")
@ -246,8 +246,8 @@ func TestPaymentControlSubscribeAllSuccess(t *testing.T) {
// for each payment.
results := make(map[lntypes.Hash]*channeldb.MPPayment)
// After exactly 5 updates both payments will/should have completed.
for i := 0; i < 5; i++ {
// After exactly 6 updates both payments will/should have completed.
for i := 0; i < 6; i++ {
select {
case item := <-subscription.Updates():
id := item.(*channeldb.MPPayment).Info.PaymentIdentifier
@ -354,10 +354,6 @@ func TestPaymentControlUnsubscribeSuccess(t *testing.T) {
err = pControl.InitPayment(info.PaymentIdentifier, info)
require.NoError(t, err)
// Register a payment update.
err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt)
require.NoError(t, err)
// Assert all subscriptions receive the update.
select {
case update1 := <-subscription1.Updates():
@ -376,14 +372,9 @@ func TestPaymentControlUnsubscribeSuccess(t *testing.T) {
// Close the first subscription.
subscription1.Close()
// Register another update.
failInfo := channeldb.HTLCFailInfo{
Reason: channeldb.HTLCFailInternal,
}
_, err = pControl.FailAttempt(
info.PaymentIdentifier, attempt.AttemptID, &failInfo,
)
require.NoError(t, err, "unable to fail htlc")
// Register a payment update.
err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt)
require.NoError(t, err)
// Assert only subscription 2 receives the update.
select {
@ -398,9 +389,14 @@ func TestPaymentControlUnsubscribeSuccess(t *testing.T) {
// Close the second subscription.
subscription2.Close()
// Register a last update.
err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt)
require.NoError(t, err)
// Register another update.
failInfo := channeldb.HTLCFailInfo{
Reason: channeldb.HTLCFailInternal,
}
_, err = pControl.FailAttempt(
info.PaymentIdentifier, attempt.AttemptID, &failInfo,
)
require.NoError(t, err, "unable to fail htlc")
// Assert no subscriptions receive the update.
require.Len(t, subscription1.Updates(), 0)