channeldb: fix linter

Author: ziggie1984

channeldb/payments.go

@@ -431,6 +431,7 @@ func (p *KVPaymentsDB) DeleteFailedAttempts(hash lntypes.Hash) error {
 			return err
 		}
 	}
+
 	return nil
 }
 
@@ -454,6 +455,7 @@ func createPaymentIndexEntry(tx kvdb.RwTx, sequenceNumber []byte,
 	}
 
 	indexes := tx.ReadWriteBucket(paymentsIndexBucket)
+
 	return indexes.Put(sequenceNumber, b.Bytes())
 }
 
@@ -621,6 +623,7 @@ func (p *KVPaymentsDB) RegisterAttempt(paymentHash lntypes.Hash,
 
 		// Retrieve attempt info for the notification.
 		payment, err = fetchPayment(bucket)
+
 		return err
 	})
 	if err != nil {
@@ -861,7 +864,6 @@ func fetchPaymentBucket(tx kvdb.RTx, paymentHash lntypes.Hash) (
 	}
 
 	return bucket, nil
-
 }
 
 // fetchPaymentBucketUpdate is identical to fetchPaymentBucket, but it returns a

channeldb/payments_test.go

@@ -1053,7 +1053,9 @@ func TestKVPaymentsDBSwitchDoubleSend(t *testing.T) {
 		},
 	)
 	require.NoError(t, err, "error shouldn't have been received, got")
-	assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusSucceeded)
+	assertPaymentStatus(
+		t, pControl, info.PaymentIdentifier, StatusSucceeded,
+	)
 
 	htlc.settle = &preimg
 	assertPaymentInfo(t, pControl, info.PaymentIdentifier, info, nil, htlc)
@@ -1164,7 +1166,9 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unable to send htlc message: %v", err)
 		}
-		_, err = pControl.RegisterAttempt(info.PaymentIdentifier, attempt)
+		_, err = pControl.RegisterAttempt(
+			info.PaymentIdentifier, attempt,
+		)
 		if err != nil {
 			t.Fatalf("unable to send htlc message: %v", err)
 		}
@@ -1188,13 +1192,18 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) {
 
 			// Fail the payment, which should moved it to Failed.
 			failReason := FailureReasonNoRoute
-			_, err = pControl.Fail(info.PaymentIdentifier, failReason)
+			_, err = pControl.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, pControl, info.PaymentIdentifier,
+				StatusFailed,
+			)
 
 			htlc.failure = &htlcFailure
 			assertPaymentInfo(
@@ -1210,21 +1219,30 @@ func TestKVPaymentsDBDeleteNonInFlight(t *testing.T) {
 				},
 			)
 			if err != nil {
-				t.Fatalf("error shouldn't have been received, got: %v", err)
+				t.Fatalf("error shouldn't have been "+
+					"received, got: %v", err)
 			}
 
-			assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusSucceeded)
+			assertPaymentStatus(
+				t, pControl, info.PaymentIdentifier,
+				StatusSucceeded,
+			)
 
 			htlc.settle = &preimg
 			assertPaymentInfo(
-				t, pControl, info.PaymentIdentifier, info, nil, htlc,
+				t, pControl, info.PaymentIdentifier, info, nil,
+				htlc,
 			)
 
 			numSuccess++
 		} else {
-			assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight)
+			assertPaymentStatus(
+				t, pControl, info.PaymentIdentifier,
+				StatusInFlight,
+			)
 			assertPaymentInfo(
-				t, pControl, info.PaymentIdentifier, info, nil, htlc,
+				t, pControl, info.PaymentIdentifier, info, nil,
+				htlc,
 			)
 
 			numInflight++
@@ -1438,7 +1456,8 @@ func TestKVPaymentsDBDeleteSinglePayment(t *testing.T) {
 	// Delete failed HTLC attempts for the third payment.
 	require.NoError(t, db.DeletePayment(payments[2].id, true))
 
-	// Only the successful HTLC attempt should be left for the third payment.
+	// Only the successful HTLC attempt should be left for the third
+	// payment.
 	payments[2].htlcs = 1
 	assertPayments(t, db, payments[2:])
 
@@ -1527,7 +1546,9 @@ func TestKVPaymentsDBMultiShard(t *testing.T) {
 			a.AttemptID = i
 			attempts = append(attempts, &a)
 
-			_, err = pControl.RegisterAttempt(info.PaymentIdentifier, &a)
+			_, err = pControl.RegisterAttempt(
+				info.PaymentIdentifier, &a,
+			)
 			if err != nil {
 				t.Fatalf("unable to send htlc message: %v", err)
 			}
@@ -1540,7 +1561,8 @@ func TestKVPaymentsDBMultiShard(t *testing.T) {
 				HTLCAttemptInfo: &a,
 			}
 			assertPaymentInfo(
-				t, pControl, info.PaymentIdentifier, info, nil, htlc,
+				t, pControl, info.PaymentIdentifier, info, nil,
+				htlc,
 			)
 		}
 
@@ -1574,7 +1596,9 @@ func TestKVPaymentsDBMultiShard(t *testing.T) {
 		)
 
 		// Payment should still be in-flight.
-		assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight)
+		assertPaymentStatus(
+			t, pControl, info.PaymentIdentifier, StatusInFlight,
+		)
 
 		// Depending on the test case, settle or fail the first attempt.
 		a = attempts[0]
@@ -1598,7 +1622,8 @@ 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, pControl, info.PaymentIdentifier, info, nil,
+				htlc,
 			)
 		} else {
 			_, err := pControl.FailAttempt(
@@ -1615,13 +1640,16 @@ func TestKVPaymentsDBMultiShard(t *testing.T) {
 			// Assert the failure was recorded.
 			htlc.failure = &htlcFail
 			assertPaymentInfo(
-				t, pControl, info.PaymentIdentifier, info, nil, htlc,
+				t, pControl, 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 = pControl.Fail(
+				info.PaymentIdentifier, failReason,
+			)
 			if err != nil {
 				t.Fatalf("unable to fail payment hash: %v", err)
 			}
@@ -1649,7 +1677,9 @@ func TestKVPaymentsDBMultiShard(t *testing.T) {
 			require.ErrorIs(t, err, ErrPaymentPendingFailed)
 		}
 
-		assertPaymentStatus(t, pControl, info.PaymentIdentifier, StatusInFlight)
+		assertPaymentStatus(
+			t, pControl, info.PaymentIdentifier, StatusInFlight,
+		)
 
 		// Settle or fail the remaining attempt based on the testcase.
 		a = attempts[2]
@@ -1696,7 +1726,9 @@ func TestKVPaymentsDBMultiShard(t *testing.T) {
 			// write a terminal failure to the database without
 			// syncing.
 			failReason := FailureReasonPaymentDetails
-			_, err = pControl.Fail(info.PaymentIdentifier, failReason)
+			_, err = pControl.Fail(
+				info.PaymentIdentifier, failReason,
+			)
 			require.NoError(t, err, "unable to fail")
 		}
 
@@ -1888,7 +1920,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, pControl.DeleteFailedAttempts(payments[1].id),
+		)
 	} else {
 		require.Error(t, pControl.DeleteFailedAttempts(payments[1].id))
 	}
@@ -1910,10 +1944,14 @@ 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, pControl.DeleteFailedAttempts(lntypes.ZeroHash),
+		)
 	} else {
 		// Attempting to cleanup a non-existent payment returns an error.
-		require.Error(t, pControl.DeleteFailedAttempts(lntypes.ZeroHash))
+		require.Error(
+			t, pControl.DeleteFailedAttempts(lntypes.ZeroHash),
+		)
 	}
 }
 
@@ -2167,7 +2205,9 @@ func assertPayments(t *testing.T, db *DB, payments []*payment) {
 
 	// Make sure that the number of fetched payments is the same
 	// as expected.
-	require.Len(t, dbPayments, len(payments), "unexpected number of payments")
+	require.Len(
+		t, dbPayments, len(payments), "unexpected number of payments",
+	)
 
 	// Convert fetched payments of type MPPayment to our helper structure.
 	p := make([]*payment, len(dbPayments))