From 8bd4744ee8bc38650cfca64892ad5b1682f26e5e Mon Sep 17 00:00:00 2001 From: ziggie Date: Fri, 1 Aug 2025 17:03:11 +0200 Subject: [PATCH] channeldb: rename pControl to paymentDB in tests --- channeldb/payments_kv_store_test.go | 208 ++++++++++++++-------------- channeldb/payments_test.go | 20 +-- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/channeldb/payments_kv_store_test.go b/channeldb/payments_kv_store_test.go index c7e7edcd6..41bb380b6 100644 --- a/channeldb/payments_kv_store_test.go +++ b/channeldb/payments_kv_store_test.go @@ -63,64 +63,64 @@ func TestKVPaymentsDBSwitchFail(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) info, attempt, preimg, err := genInfo(t) require.NoError(t, err, "unable to generate htlc message") // Sends base htlc message which initiate StatusInFlight. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) require.NoError(t, err, "unable to send htlc message") - assertPaymentIndex(t, pControl, info.PaymentIdentifier) + assertPaymentIndex(t, paymentDB, info.PaymentIdentifier) assertPaymentStatus( - t, pControl, info.PaymentIdentifier, StatusInitiated, + t, paymentDB, info.PaymentIdentifier, StatusInitiated, ) assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, nil, + t, paymentDB, info.PaymentIdentifier, info, nil, nil, ) // Fail the payment, which should moved it to Failed. failReason := FailureReasonNoRoute - _, err = pControl.Fail(info.PaymentIdentifier, failReason) + _, err = paymentDB.Fail(info.PaymentIdentifier, failReason) require.NoError(t, err, "unable to fail payment hash") // Verify the status is indeed Failed. - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusFailed) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusFailed) assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, &failReason, nil, + t, paymentDB, info.PaymentIdentifier, info, &failReason, nil, ) // Lookup the payment so we can get its old sequence number before it is // overwritten. - payment, err := pControl.FetchPayment(info.PaymentIdentifier) + payment, err := paymentDB.FetchPayment(info.PaymentIdentifier) require.NoError(t, err) // Sends the htlc again, which should succeed since the prior payment // failed. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) require.NoError(t, err, "unable to send htlc message") // Check that our index has been updated, and the old index has been // removed. - assertPaymentIndex(t, pControl, info.PaymentIdentifier) - assertNoIndex(t, pControl, payment.SequenceNum) + assertPaymentIndex(t, paymentDB, info.PaymentIdentifier) + assertNoIndex(t, paymentDB, payment.SequenceNum) assertPaymentStatus( - t, pControl, info.PaymentIdentifier, StatusInitiated, + t, paymentDB, info.PaymentIdentifier, StatusInitiated, ) assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, nil, + t, paymentDB, info.PaymentIdentifier, info, nil, nil, ) // Record a new attempt. In this test scenario, the attempt fails. // However, this is not communicated to control tower in the current // implementation. It only registers the initiation of the attempt. - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, attempt) require.NoError(t, err, "unable to register attempt") htlcReason := HTLCFailUnreadable - _, err = pControl.FailAttempt( + _, err = paymentDB.FailAttempt( info.PaymentIdentifier, attempt.AttemptID, &HTLCFailInfo{ Reason: htlcReason, @@ -130,7 +130,7 @@ func TestKVPaymentsDBSwitchFail(t *testing.T) { t.Fatal(err) } assertPaymentStatus( - t, pControl, info.PaymentIdentifier, StatusInFlight, + t, paymentDB, info.PaymentIdentifier, StatusInFlight, ) htlc := &htlcStatus{ @@ -138,25 +138,25 @@ func TestKVPaymentsDBSwitchFail(t *testing.T) { failure: &htlcReason, } - assertPaymentInfo(t, pControl, info.PaymentIdentifier, info, nil, htlc) + assertPaymentInfo(t, paymentDB, info.PaymentIdentifier, info, nil, htlc) // Record another attempt. attempt.AttemptID = 1 - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, attempt) require.NoError(t, err, "unable to send htlc message") - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusInFlight) htlc = &htlcStatus{ HTLCAttemptInfo: attempt, } assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) // Settle the attempt and verify that status was changed to // StatusSucceeded. - payment, err = pControl.SettleAttempt( + payment, err = paymentDB.SettleAttempt( info.PaymentIdentifier, attempt.AttemptID, &HTLCSettleInfo{ Preimage: preimg, @@ -176,16 +176,16 @@ func TestKVPaymentsDBSwitchFail(t *testing.T) { spew.Sdump(payment.HTLCs[0].Route), err) } - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusSucceeded) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusSucceeded) htlc.settle = &preimg assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) // Attempt a final payment, which should now fail since the prior // payment succeed. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) if !errors.Is(err, ErrAlreadyPaid) { t.Fatalf("unable to send htlc message: %v", err) } @@ -199,63 +199,63 @@ func TestKVPaymentsDBSwitchDoubleSend(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) info, attempt, preimg, err := genInfo(t) require.NoError(t, err, "unable to generate htlc message") // Sends base htlc message which initiate base status and move it to // StatusInFlight and verifies that it was changed. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) require.NoError(t, err, "unable to send htlc message") - assertPaymentIndex(t, pControl, info.PaymentIdentifier) + assertPaymentIndex(t, paymentDB, info.PaymentIdentifier) assertPaymentStatus( - t, pControl, info.PaymentIdentifier, StatusInitiated, + t, paymentDB, info.PaymentIdentifier, StatusInitiated, ) assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, nil, + t, paymentDB, info.PaymentIdentifier, info, nil, nil, ) // Try to initiate double sending of htlc message with the same // payment hash, should result in error indicating that payment has // already been sent. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) require.ErrorIs(t, err, ErrPaymentExists) // Record an attempt. - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, attempt) require.NoError(t, err, "unable to send htlc message") - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusInFlight) htlc := &htlcStatus{ HTLCAttemptInfo: attempt, } assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) // Sends base htlc message which initiate StatusInFlight. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) if !errors.Is(err, ErrPaymentInFlight) { t.Fatalf("payment control wrong behaviour: " + "double sending must trigger ErrPaymentInFlight error") } // After settling, the error should be ErrAlreadyPaid. - _, err = pControl.SettleAttempt( + _, err = paymentDB.SettleAttempt( info.PaymentIdentifier, attempt.AttemptID, &HTLCSettleInfo{ Preimage: preimg, }, ) require.NoError(t, err, "error shouldn't have been received, got") - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusSucceeded) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusSucceeded) htlc.settle = &preimg - assertPaymentInfo(t, pControl, info.PaymentIdentifier, info, nil, htlc) + assertPaymentInfo(t, paymentDB, info.PaymentIdentifier, info, nil, htlc) - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) if !errors.Is(err, ErrAlreadyPaid) { t.Fatalf("unable to send htlc message: %v", err) } @@ -269,13 +269,13 @@ func TestKVPaymentsDBSuccessesWithoutInFlight(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) info, _, preimg, err := genInfo(t) require.NoError(t, err, "unable to generate htlc message") // Attempt to complete the payment should fail. - _, err = pControl.SettleAttempt( + _, err = paymentDB.SettleAttempt( info.PaymentIdentifier, 0, &HTLCSettleInfo{ Preimage: preimg, @@ -294,13 +294,13 @@ func TestKVPaymentsDBFailsWithoutInFlight(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) info, _, _, err := genInfo(t) require.NoError(t, err, "unable to generate htlc message") // Calling Fail should return an error. - _, err = pControl.Fail(info.PaymentIdentifier, FailureReasonNoRoute) + _, err = paymentDB.Fail(info.PaymentIdentifier, FailureReasonNoRoute) if err != ErrPaymentNotInitiated { t.Fatalf("expected ErrPaymentNotInitiated, got %v", err) } @@ -319,7 +319,7 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) { // start at 1, so 9999 is a safe bet for this test. var duplicateSeqNr = 9999 - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) payments := []struct { failed bool @@ -357,11 +357,11 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) { } // Sends base htlc message which initiate StatusInFlight. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) if err != nil { t.Fatalf("unable to send htlc message: %v", err) } - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, attempt) if err != nil { t.Fatalf("unable to send htlc message: %v", err) } @@ -373,7 +373,7 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) { if p.failed { // Fail the payment attempt. htlcFailure := HTLCFailUnreadable - _, err := pControl.FailAttempt( + _, err := paymentDB.FailAttempt( info.PaymentIdentifier, attempt.AttemptID, &HTLCFailInfo{ Reason: htlcFailure, @@ -385,22 +385,22 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) { // Fail the payment, which should moved it to Failed. failReason := FailureReasonNoRoute - _, err = pControl.Fail(info.PaymentIdentifier, failReason) + _, err = paymentDB.Fail(info.PaymentIdentifier, failReason) if err != nil { t.Fatalf("unable to fail payment hash: %v", err) } // Verify the status is indeed Failed. - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusFailed) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusFailed) htlc.failure = &htlcFailure assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, + t, paymentDB, info.PaymentIdentifier, info, &failReason, htlc, ) } else if p.success { // Verifies that status was changed to StatusSucceeded. - _, err := pControl.SettleAttempt( + _, err := paymentDB.SettleAttempt( info.PaymentIdentifier, attempt.AttemptID, &HTLCSettleInfo{ Preimage: preimg, @@ -410,18 +410,18 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) { t.Fatalf("error shouldn't have been received, got: %v", err) } - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusSucceeded) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusSucceeded) htlc.settle = &preimg assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) numSuccess++ } else { - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusInFlight) assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) numInflight++ @@ -431,7 +431,7 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) { // add one. if p.hasDuplicate { appendDuplicatePayment( - t, pControl.db, info.PaymentIdentifier, + t, paymentDB.db, info.PaymentIdentifier, uint64(duplicateSeqNr), preimg, ) duplicateSeqNr++ @@ -521,7 +521,7 @@ func TestKVPaymentsDBDeletePayments(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) // Register three payments: // 1. A payment with two failed attempts. @@ -535,7 +535,7 @@ func TestKVPaymentsDBDeletePayments(t *testing.T) { // Use helper function to register the test payments in the data and // populate the data to the payments slice. - createTestPayments(t, pControl, payments) + createTestPayments(t, paymentDB, payments) // Check that all payments are there as we added them. assertPayments(t, db, payments) @@ -582,7 +582,7 @@ func TestKVPaymentsDBDeleteSinglePayment(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) // Register four payments: // All payments will have one failed HTLC attempt and one HTLC attempt @@ -607,7 +607,7 @@ func TestKVPaymentsDBDeleteSinglePayment(t *testing.T) { // Use helper function to register the test payments in the data and // populate the data to the payments slice. - createTestPayments(t, pControl, payments) + createTestPayments(t, paymentDB, payments) // Check that all payments are there as we added them. assertPayments(t, db, payments) @@ -687,7 +687,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { t.Fatalf("unable to init db: %v", err) } - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) info, attempt, preimg, err := genInfo(t) if err != nil { @@ -695,17 +695,17 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { } // Init the payment, moving it to the StatusInFlight state. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) if err != nil { t.Fatalf("unable to send htlc message: %v", err) } - assertPaymentIndex(t, pControl, info.PaymentIdentifier) + assertPaymentIndex(t, paymentDB, info.PaymentIdentifier) assertPaymentStatus( - t, pControl, info.PaymentIdentifier, StatusInitiated, + t, paymentDB, info.PaymentIdentifier, StatusInitiated, ) assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, nil, + t, paymentDB, info.PaymentIdentifier, info, nil, nil, ) // Create three unique attempts we'll use for the test, and @@ -724,12 +724,12 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { a.AttemptID = i attempts = append(attempts, &a) - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &a) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &a) if err != nil { t.Fatalf("unable to send htlc message: %v", err) } assertPaymentStatus( - t, pControl, info.PaymentIdentifier, + t, paymentDB, info.PaymentIdentifier, StatusInFlight, ) @@ -737,7 +737,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { HTLCAttemptInfo: &a, } assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) } @@ -746,13 +746,13 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // will be too large. b := *attempt b.AttemptID = 3 - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) require.ErrorIs(t, err, ErrValueExceedsAmt) // Fail the second attempt. a := attempts[1] htlcFail := HTLCFailUnreadable - _, err = pControl.FailAttempt( + _, err = paymentDB.FailAttempt( info.PaymentIdentifier, a.AttemptID, &HTLCFailInfo{ Reason: htlcFail, @@ -767,11 +767,11 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { failure: &htlcFail, } assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) // Payment should still be in-flight. - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusInFlight) // Depending on the test case, settle or fail the first attempt. a = attempts[0] @@ -781,7 +781,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { var firstFailReason *FailureReason if test.settleFirst { - _, err := pControl.SettleAttempt( + _, err := paymentDB.SettleAttempt( info.PaymentIdentifier, a.AttemptID, &HTLCSettleInfo{ Preimage: preimg, @@ -795,10 +795,10 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // Assert that the HTLC has had the preimage recorded. htlc.settle = &preimg assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) } else { - _, err := pControl.FailAttempt( + _, err := paymentDB.FailAttempt( info.PaymentIdentifier, a.AttemptID, &HTLCFailInfo{ Reason: htlcFail, @@ -812,13 +812,13 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // Assert the failure was recorded. htlc.failure = &htlcFail assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, nil, htlc, + t, paymentDB, info.PaymentIdentifier, info, nil, htlc, ) // We also record a payment level fail, to move it into // a terminal state. failReason := FailureReasonNoRoute - _, err = pControl.Fail(info.PaymentIdentifier, failReason) + _, err = paymentDB.Fail(info.PaymentIdentifier, failReason) if err != nil { t.Fatalf("unable to fail payment hash: %v", err) } @@ -830,7 +830,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // The payment is now considered pending fail, since // there is still an active HTLC. assertPaymentStatus( - t, pControl, info.PaymentIdentifier, + t, paymentDB, info.PaymentIdentifier, StatusInFlight, ) } @@ -839,14 +839,14 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // that the payment has reached a terminal condition. b = *attempt b.AttemptID = 3 - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) if test.settleFirst { require.ErrorIs(t, err, ErrPaymentPendingSettled) } else { require.ErrorIs(t, err, ErrPaymentPendingFailed) } - assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight) + assertPaymentStatus(t, paymentDB, info.PaymentIdentifier, StatusInFlight) // Settle or fail the remaining attempt based on the testcase. a = attempts[2] @@ -855,7 +855,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { } if test.settleLast { // Settle the last outstanding attempt. - _, err = pControl.SettleAttempt( + _, err = paymentDB.SettleAttempt( info.PaymentIdentifier, a.AttemptID, &HTLCSettleInfo{ Preimage: preimg, @@ -865,12 +865,12 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { htlc.settle = &preimg assertPaymentInfo( - t, pControl, info.PaymentIdentifier, + t, paymentDB, info.PaymentIdentifier, info, firstFailReason, htlc, ) } else { // Fail the attempt. - _, err := pControl.FailAttempt( + _, err := paymentDB.FailAttempt( info.PaymentIdentifier, a.AttemptID, &HTLCFailInfo{ Reason: htlcFail, @@ -884,7 +884,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // Assert the failure was recorded. htlc.failure = &htlcFail assertPaymentInfo( - t, pControl, info.PaymentIdentifier, info, + t, paymentDB, info.PaymentIdentifier, info, firstFailReason, htlc, ) @@ -893,7 +893,7 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { // write a terminal failure to the database without // syncing. failReason := FailureReasonPaymentDetails - _, err = pControl.Fail(info.PaymentIdentifier, failReason) + _, err = paymentDB.Fail(info.PaymentIdentifier, failReason) require.NoError(t, err, "unable to fail") } @@ -926,11 +926,11 @@ func TestKVPaymentsDBMultiShard(t *testing.T) { } assertPaymentStatus( - t, pControl, info.PaymentIdentifier, finalStatus, + t, paymentDB, info.PaymentIdentifier, finalStatus, ) // Finally assert we cannot register more attempts. - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) require.Equal(t, registerErr, err) } @@ -951,13 +951,13 @@ func TestKVPaymentsDBMPPRecordValidation(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err, "unable to init db") - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) info, attempt, _, err := genInfo(t) require.NoError(t, err, "unable to generate htlc message") // Init the payment. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) require.NoError(t, err, "unable to send htlc message") // Create three unique attempts we'll use for the test, and @@ -970,14 +970,14 @@ func TestKVPaymentsDBMPPRecordValidation(t *testing.T) { info.Value, [32]byte{1}, ) - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, attempt) require.NoError(t, err, "unable to send htlc message") // Now try to register a non-MPP attempt, which should fail. b := *attempt b.AttemptID = 1 b.Route.FinalHop().MPP = nil - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) if err != ErrMPPayment { t.Fatalf("expected ErrMPPayment, got: %v", err) } @@ -986,7 +986,7 @@ func TestKVPaymentsDBMPPRecordValidation(t *testing.T) { b.Route.FinalHop().MPP = record.NewMPP( info.Value, [32]byte{2}, ) - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) if err != ErrMPPPaymentAddrMismatch { t.Fatalf("expected ErrMPPPaymentAddrMismatch, got: %v", err) } @@ -995,7 +995,7 @@ func TestKVPaymentsDBMPPRecordValidation(t *testing.T) { b.Route.FinalHop().MPP = record.NewMPP( info.Value/2, [32]byte{1}, ) - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) if err != ErrMPPTotalAmountMismatch { t.Fatalf("expected ErrMPPTotalAmountMismatch, got: %v", err) } @@ -1005,11 +1005,11 @@ func TestKVPaymentsDBMPPRecordValidation(t *testing.T) { info, attempt, _, err = genInfo(t) require.NoError(t, err, "unable to generate htlc message") - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) require.NoError(t, err, "unable to send htlc message") attempt.Route.FinalHop().MPP = nil - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, attempt) require.NoError(t, err, "unable to send htlc message") // Attempt to register an MPP attempt, which should fail. @@ -1019,7 +1019,7 @@ func TestKVPaymentsDBMPPRecordValidation(t *testing.T) { info.Value, [32]byte{1}, ) - _, err = pControl.RegisterAttempt(info.PaymentIdentifier, &b) + _, err = paymentDB.RegisterAttempt(info.PaymentIdentifier, &b) if err != ErrNonMPPayment { t.Fatalf("expected ErrNonMPPayment, got: %v", err) } @@ -1044,7 +1044,7 @@ func testDeleteFailedAttempts(t *testing.T, keepFailedPaymentAttempts bool) { require.NoError(t, err, "unable to init db") db.keepFailedPaymentAttempts = keepFailedPaymentAttempts - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) // Register three payments: // All payments will have one failed HTLC attempt and one HTLC attempt @@ -1067,14 +1067,14 @@ func testDeleteFailedAttempts(t *testing.T, keepFailedPaymentAttempts bool) { // Use helper function to register the test payments in the data and // populate the data to the payments slice. - createTestPayments(t, pControl, payments) + createTestPayments(t, paymentDB, payments) // Check that all payments are there as we added them. assertPayments(t, db, payments) // Calling DeleteFailedAttempts on a failed payment should delete all // HTLCs. - require.NoError(t, pControl.DeleteFailedAttempts(payments[0].id)) + require.NoError(t, paymentDB.DeleteFailedAttempts(payments[0].id)) // Expect all HTLCs to be deleted if the config is set to delete them. if !keepFailedPaymentAttempts { @@ -1085,9 +1085,9 @@ func testDeleteFailedAttempts(t *testing.T, keepFailedPaymentAttempts bool) { // Calling DeleteFailedAttempts on an in-flight payment should return // an error. if keepFailedPaymentAttempts { - require.NoError(t, pControl.DeleteFailedAttempts(payments[1].id)) + require.NoError(t, paymentDB.DeleteFailedAttempts(payments[1].id)) } else { - require.Error(t, pControl.DeleteFailedAttempts(payments[1].id)) + require.Error(t, paymentDB.DeleteFailedAttempts(payments[1].id)) } // Since DeleteFailedAttempts returned an error, we should expect the @@ -1095,7 +1095,7 @@ func testDeleteFailedAttempts(t *testing.T, keepFailedPaymentAttempts bool) { assertPayments(t, db, payments) // Cleaning up a successful payment should remove failed htlcs. - require.NoError(t, pControl.DeleteFailedAttempts(payments[2].id)) + require.NoError(t, paymentDB.DeleteFailedAttempts(payments[2].id)) // Expect all HTLCs except for the settled one to be deleted if the // config is set to delete them. if !keepFailedPaymentAttempts { @@ -1107,10 +1107,10 @@ func testDeleteFailedAttempts(t *testing.T, keepFailedPaymentAttempts bool) { // DeleteFailedAttempts is ignored, even for non-existent // payments, if the control tower is configured to keep failed // HTLCs. - require.NoError(t, pControl.DeleteFailedAttempts(lntypes.ZeroHash)) + require.NoError(t, paymentDB.DeleteFailedAttempts(lntypes.ZeroHash)) } else { // Attempting to cleanup a non-existent payment returns an error. - require.Error(t, pControl.DeleteFailedAttempts(lntypes.ZeroHash)) + require.Error(t, paymentDB.DeleteFailedAttempts(lntypes.ZeroHash)) } } diff --git a/channeldb/payments_test.go b/channeldb/payments_test.go index 7a2312d03..9514edab6 100644 --- a/channeldb/payments_test.go +++ b/channeldb/payments_test.go @@ -516,7 +516,7 @@ func TestQueryPayments(t *testing.T) { // where we have duplicates in the nested duplicates // bucket. nonDuplicatePayments := 6 - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) for i := 0; i < nonDuplicatePayments; i++ { // Generate a test payment. @@ -530,7 +530,7 @@ func TestQueryPayments(t *testing.T) { info.CreationTime = time.Unix(int64(i+1), 0) // Create a new payment entry in the database. - err = pControl.InitPayment(info.PaymentIdentifier, info) + err = paymentDB.InitPayment(info.PaymentIdentifier, info) if err != nil { t.Fatalf("unable to initialize "+ "payment in database: %v", err) @@ -538,7 +538,7 @@ func TestQueryPayments(t *testing.T) { // Immediately delete the payment with index 2. if i == 1 { - pmt, err := pControl.FetchPayment( + pmt, err := paymentDB.FetchPayment( info.PaymentIdentifier, ) require.NoError(t, err) @@ -552,13 +552,13 @@ func TestQueryPayments(t *testing.T) { // to the parent payment + 1. Note that // duplicate payments will always be succeeded. if i == (nonDuplicatePayments - 1) { - pmt, err := pControl.FetchPayment( + pmt, err := paymentDB.FetchPayment( info.PaymentIdentifier, ) require.NoError(t, err) appendDuplicatePayment( - t, pControl.db, + t, paymentDB.db, info.PaymentIdentifier, pmt.SequenceNum+1, preimg, @@ -618,18 +618,18 @@ func TestFetchPaymentWithSequenceNumber(t *testing.T) { db, err := MakeTestDB(t) require.NoError(t, err) - pControl := NewKVPaymentsDB(db) + paymentDB := NewKVPaymentsDB(db) // Generate a test payment which does not have duplicates. noDuplicates, _, _, err := genInfo(t) require.NoError(t, err) // Create a new payment entry in the database. - err = pControl.InitPayment(noDuplicates.PaymentIdentifier, noDuplicates) + err = paymentDB.InitPayment(noDuplicates.PaymentIdentifier, noDuplicates) require.NoError(t, err) // Fetch the payment so we can get its sequence nr. - noDuplicatesPayment, err := pControl.FetchPayment( + noDuplicatesPayment, err := paymentDB.FetchPayment( noDuplicates.PaymentIdentifier, ) require.NoError(t, err) @@ -639,11 +639,11 @@ func TestFetchPaymentWithSequenceNumber(t *testing.T) { require.NoError(t, err) // Create a new payment entry in the database. - err = pControl.InitPayment(hasDuplicates.PaymentIdentifier, hasDuplicates) + err = paymentDB.InitPayment(hasDuplicates.PaymentIdentifier, hasDuplicates) require.NoError(t, err) // Fetch the payment so we can get its sequence nr. - hasDuplicatesPayment, err := pControl.FetchPayment( + hasDuplicatesPayment, err := paymentDB.FetchPayment( hasDuplicates.PaymentIdentifier, ) require.NoError(t, err)