mulit: fix linter

Author: ziggie1984

payments/db/payment_test.go

@@ -418,7 +418,6 @@ func genAttemptWithHash(t *testing.T, attemptID uint64,
 
 // genInfo generates a payment creation info and the corresponding preimage.
 func genInfo(t *testing.T) (*PaymentCreationInfo, lntypes.Preimage, error) {
-
 	preimage, _, err := genPreimageAndHash(t)
 	if err != nil {
 		return nil, preimage, err
@@ -2392,14 +2391,10 @@ func TestQueryPayments(t *testing.T) {
 						"got %v", expectedTotal,
 						querySlice.TotalCount)
 				}
-			} else {
-				// When CountTotal is false, TotalCount should
-				// be 0.
-				if querySlice.TotalCount != 0 {
-					t.Errorf("expected total count 0 when "+
-						"CountTotal=false, got %v",
-						querySlice.TotalCount)
-				}
+			} else if querySlice.TotalCount != 0 {
+				t.Errorf("expected total count 0 when "+
+					"CountTotal=false, got %v",
+					querySlice.TotalCount)
 			}
 		})
 	}

payments/db/sql_store.go

@@ -628,7 +628,6 @@ func (s *SQLStore) DeletePayment(paymentHash lntypes.Hash,
 		// Be careful to not use s.db here, because we are in a
 		// transaction, is there a way to make this more secure?
 		return db.DeletePayment(ctx, fetchPayment.Payment.ID)
-
 	}, func() {
 	})
 	if err != nil {
@@ -746,10 +745,12 @@ func (s *SQLStore) InitPayment(paymentHash lntypes.Hash,
 			intentIDParam = sqldb.SQLInt64(*intentID)
 		}
 
+		timeCreated := paymentCreationInfo.CreationTime.UTC()
+
 		err = db.InsertPayment(ctx, sqlc.InsertPaymentParams{
 			IntentID:          intentIDParam,
 			AmountMsat:        int64(paymentCreationInfo.Value),
-			CreatedAt:         paymentCreationInfo.CreationTime.UTC(),
+			CreatedAt:         timeCreated,
 			PaymentIdentifier: paymentHash[:],
 		})
 		if err != nil {
@@ -760,9 +761,11 @@ func (s *SQLStore) InitPayment(paymentHash lntypes.Hash,
 		// We need to fetch the payment we just inserted to get its ID
 		insertedPayment, err := db.FetchPayment(ctx, paymentHash[:])
 		if err != nil {
-			return fmt.Errorf("failed to fetch inserted payment: %w", err)
+			return fmt.Errorf("failed to fetch inserted "+
+				"payment: %w", err)
 		}
 
+		//nolint:ll
 		for key, value := range paymentCreationInfo.FirstHopCustomRecords {
 			err = db.InsertPaymentFirstHopCustomRecord(ctx,
 				sqlc.InsertPaymentFirstHopCustomRecordParams{
@@ -811,26 +814,31 @@ func (s *SQLStore) insertRouteHops(ctx context.Context, db SQLQueries,
 		// Insert the per-hop custom records
 		if len(hop.CustomRecords) > 0 {
 			for key, value := range hop.CustomRecords {
-				err = db.InsertPaymentHopCustomRecord(ctx, sqlc.InsertPaymentHopCustomRecordParams{
-					HopID: hopID,
-					Key:   int64(key),
-					Value: value,
-				})
+				err = db.InsertPaymentHopCustomRecord(ctx,
+					sqlc.InsertPaymentHopCustomRecordParams{
+						HopID: hopID,
+						Key:   int64(key),
+						Value: value,
+					},
+				)
 				if err != nil {
 					return fmt.Errorf("failed to insert "+
-						"payment hop custom record: %w", err)
+						"payment hop custom "+
+						"records: %w", err)
 				}
 			}
 		}
 
 		// Insert MPP data if present
 		if hop.MPP != nil {
 			paymentAddr := hop.MPP.PaymentAddr()
-			err = db.InsertRouteHopMpp(ctx, sqlc.InsertRouteHopMppParams{
-				HopID:       hopID,
-				PaymentAddr: paymentAddr[:],
-				TotalMsat:   int64(hop.MPP.TotalMsat()),
-			})
+			err = db.InsertRouteHopMpp(ctx,
+				sqlc.InsertRouteHopMppParams{
+					HopID:       hopID,
+					PaymentAddr: paymentAddr[:],
+					TotalMsat:   int64(hop.MPP.TotalMsat()),
+				},
+			)
 			if err != nil {
 				return fmt.Errorf("failed to insert "+
 					"route hop MPP: %w", err)
@@ -841,11 +849,13 @@ func (s *SQLStore) insertRouteHops(ctx context.Context, db SQLQueries,
 		if hop.AMP != nil {
 			rootShare := hop.AMP.RootShare()
 			setID := hop.AMP.SetID()
-			err = db.InsertRouteHopAmp(ctx, sqlc.InsertRouteHopAmpParams{
-				HopID:     hopID,
-				RootShare: rootShare[:],
-				SetID:     setID[:],
-			})
+			err = db.InsertRouteHopAmp(ctx,
+				sqlc.InsertRouteHopAmpParams{
+					HopID:     hopID,
+					RootShare: rootShare[:],
+					SetID:     setID[:],
+				},
+			)
 			if err != nil {
 				return fmt.Errorf("failed to insert "+
 					"route hop AMP: %w", err)
@@ -856,15 +866,19 @@ func (s *SQLStore) insertRouteHops(ctx context.Context, db SQLQueries,
 		if hop.EncryptedData != nil || hop.BlindingPoint != nil {
 			var blindingPointBytes []byte
 			if hop.BlindingPoint != nil {
+				//nolint:ll
 				blindingPointBytes = hop.BlindingPoint.SerializeCompressed()
 			}
 
-			err = db.InsertRouteHopBlinded(ctx, sqlc.InsertRouteHopBlindedParams{
-				HopID:               hopID,
-				EncryptedData:       hop.EncryptedData,
-				BlindingPoint:       blindingPointBytes,
-				BlindedPathTotalAmt: sqldb.SQLInt64(hop.TotalAmtMsat),
-			})
+			err = db.InsertRouteHopBlinded(ctx,
+				//nolint:ll
+				sqlc.InsertRouteHopBlindedParams{
+					HopID:               hopID,
+					EncryptedData:       hop.EncryptedData,
+					BlindingPoint:       blindingPointBytes,
+					BlindedPathTotalAmt: sqldb.SQLInt64(hop.TotalAmtMsat),
+				},
+			)
 			if err != nil {
 				return fmt.Errorf("failed to insert "+
 					"route hop blinded: %w", err)
@@ -934,8 +948,10 @@ func (s *SQLStore) RegisterAttempt(paymentHash lntypes.Hash,
 		}
 
 		// Insert the route level first hop custom records.
+		//nolint:ll
 		for key, value := range attempt.Route.FirstHopWireCustomRecords {
 			err = db.InsertPaymentAttemptFirstHopCustomRecord(ctx,
+				//nolint:ll
 				sqlc.InsertPaymentAttemptFirstHopCustomRecordParams{
 					HtlcAttemptIndex: int64(attempt.AttemptID),
 					Key:              int64(key),
@@ -1057,6 +1073,7 @@ func (s *SQLStore) FailAttempt(paymentHash lntypes.Hash,
 			}
 		}
 
+		//nolint:ll
 		err = db.FailAttempt(ctx, sqlc.FailAttemptParams{
 			AttemptIndex:       int64(attemptID),
 			ResolutionTime:     time.Now(),
@@ -1069,9 +1086,12 @@ func (s *SQLStore) FailAttempt(paymentHash lntypes.Hash,
 			return fmt.Errorf("failed to fail attempt: %w", err)
 		}
 
-		mpPayment, err = s.fetchPaymentWithCompleteData(ctx, db, payment)
+		mpPayment, err = s.fetchPaymentWithCompleteData(
+			ctx, db, payment,
+		)
 		if err != nil {
-			return fmt.Errorf("failed to fetch payment with complete data: %w", err)
+			return fmt.Errorf("failed to fetch payment with"+
+				"complete data: %w", err)
 		}
 
 		return nil
@@ -1220,7 +1240,6 @@ func (s *SQLStore) DeletePayments(failedOnly, failedHtlcsOnly bool) (int,
 			ctx, s.cfg.QueryCfg, int64(-1), queryFunc,
 			extractCursor, processPayment,
 		)
-
 	}, func() {
 		numPayments = 0
 	})