[Part 7|*] Addressing TODOs left from the SQL payments implementation

config_builder.go

@@ -1236,9 +1236,6 @@ func (d *DefaultDatabaseBuilder) BuildDatabase(
 		// will build a SQL payments backend.
 		sqlPaymentsDB, err := d.getPaymentsStore(
 			baseDB, dbs.ChanStateDB.Backend,
-			paymentsdb.WithKeepFailedPaymentAttempts(
-				cfg.KeepFailedPaymentAttempts,
-			),
 		)
 		if err != nil {
 			err = fmt.Errorf("unable to get payments store: %w",
@@ -1280,9 +1277,6 @@ func (d *DefaultDatabaseBuilder) BuildDatabase(
 		// Create the payments DB.
 		kvPaymentsDB, err := paymentsdb.NewKVStore(
 			dbs.ChanStateDB,
-			paymentsdb.WithKeepFailedPaymentAttempts(
-				cfg.KeepFailedPaymentAttempts,
-			),
 		)
 		if err != nil {
 			cleanUp()

docs/release-notes/release-notes-0.21.0.md

@@ -85,6 +85,10 @@
     for SQL backend](https://github.com/lightningnetwork/lnd/pull/10292)
   * [Thread context through payment 
     db functions Part 1](https://github.com/lightningnetwork/lnd/pull/10307)
+  * [Thread context through payment 
+    db functions Part 2](https://github.com/lightningnetwork/lnd/pull/10308)
+  * [Finalize SQL implementation for 
+    payments db](https://github.com/lightningnetwork/lnd/pull/10373)
 
 
 ## Code Health

lnrpc/routerrpc/router_server.go

@@ -936,11 +936,11 @@ func (s *Server) SendToRouteV2(ctx context.Context,
 	// db.
 	if req.SkipTempErr {
 		attempt, err = s.cfg.Router.SendToRouteSkipTempErr(
-			hash, route, firstHopRecords,
+			ctx, hash, route, firstHopRecords,
 		)
 	} else {
 		attempt, err = s.cfg.Router.SendToRoute(
-			hash, route, firstHopRecords,
+			ctx, hash, route, firstHopRecords,
 		)
 	}
 	if attempt != nil {

payments/db/kv_store.go

@@ -127,10 +127,6 @@ type KVStore struct {
 
 	// db is the underlying database implementation.
 	db kvdb.Backend
-
-	// keepFailedPaymentAttempts is a flag that indicates whether we should
-	// keep failed payment attempts in the database.
-	keepFailedPaymentAttempts bool
 }
 
 // A compile-time constraint to ensure KVStore implements DB.
@@ -152,8 +148,7 @@ func NewKVStore(db kvdb.Backend,
 	}
 
 	return &KVStore{
-		db:                        db,
-		keepFailedPaymentAttempts: opts.KeepFailedPaymentAttempts,
+		db: db,
 	}, nil
 }
 
@@ -288,19 +283,14 @@ func (p *KVStore) InitPayment(_ context.Context, paymentHash lntypes.Hash,
 	return updateErr
 }
 
-// DeleteFailedAttempts deletes all failed htlcs for a payment if configured
-// by the KVStore db.
+// DeleteFailedAttempts deletes all failed htlcs for a payment.
 func (p *KVStore) DeleteFailedAttempts(ctx context.Context,
 	hash lntypes.Hash) error {
 
-	// TODO(ziggie): Refactor to not mix application logic with database
-	// logic. This decision should be made in the application layer.
-	if !p.keepFailedPaymentAttempts {
-		const failedHtlcsOnly = true
-		err := p.DeletePayment(ctx, hash, failedHtlcsOnly)
-		if err != nil {
-			return err
-		}
+	const failedHtlcsOnly = true
+	err := p.DeletePayment(ctx, hash, failedHtlcsOnly)
+	if err != nil {
+		return err
 	}
 
 	return nil