From 25056c654713104e341ddf3732e51bfe03279da4 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 4 Mar 2026 18:11:42 -0500
Subject: [PATCH] staticaddr: remove redundant pgx.ErrNoRows checks

pgx/v5 defines ErrNoRows as a wrapped sql.ErrNoRows, so this code covers both
of them: errors.Is(err, sql.ErrNoRows).
---
 staticaddr/deposit/sql_store.go      | 5 +----
 staticaddr/deposit/sql_store_test.go | 8 ++++++++
 staticaddr/loopin/sql_store.go       | 5 +----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/staticaddr/deposit/sql_store.go b/staticaddr/deposit/sql_store.go
index a75d9bf4..d9f4249f 100644
--- a/staticaddr/deposit/sql_store.go
+++ b/staticaddr/deposit/sql_store.go
@@ -10,7 +10,6 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
-	"github.com/jackc/pgx/v5"
 	"github.com/lightninglabs/loop/fsm"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/loopdb/sqlc"
@@ -176,9 +175,7 @@ func (s *SqlStore) DepositForOutpoint(ctx context.Context,
 			}
 			row, err := q.DepositForOutpoint(ctx, params)
 			if err != nil {
-				if errors.Is(err, sql.ErrNoRows) ||
-					errors.Is(err, pgx.ErrNoRows) {
-
+				if errors.Is(err, sql.ErrNoRows) {
 					return ErrDepositNotFound
 				}
 
diff --git a/staticaddr/deposit/sql_store_test.go b/staticaddr/deposit/sql_store_test.go
index d911f9e2..5656e386 100644
--- a/staticaddr/deposit/sql_store_test.go
+++ b/staticaddr/deposit/sql_store_test.go
@@ -1,9 +1,11 @@
 package deposit
 
 import (
+	"database/sql"
 	"testing"
 
 	"github.com/btcsuite/btcd/wire"
+	"github.com/jackc/pgx/v5"
 	"github.com/lightninglabs/loop/fsm"
 	"github.com/lightninglabs/loop/loopdb/sqlc"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -76,3 +78,9 @@ func dummyHashBytes() []byte {
 		0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
 		0x20, 0x21, 0x22, 0x23}
 }
+
+// TestErrNoRows ensures that pgx.ErrNoRows is a wrapped sql.ErrNoRows, so we
+// don't have to check against both of them.
+func TestErrNoRows(t *testing.T) {
+	require.ErrorIs(t, pgx.ErrNoRows, sql.ErrNoRows)
+}
diff --git a/staticaddr/loopin/sql_store.go b/staticaddr/loopin/sql_store.go
index da4c9298..1b70bbc4 100644
--- a/staticaddr/loopin/sql_store.go
+++ b/staticaddr/loopin/sql_store.go
@@ -10,7 +10,6 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/jackc/pgx/v5"
 	"github.com/lightninglabs/loop/fsm"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/loopdb/sqlc"
@@ -422,9 +421,7 @@ func (s *SqlStore) SwapHashesForDepositIDs(ctx context.Context,
 	for _, id := range depositIDs {
 		swapHash, err := s.baseDB.SwapHashForDepositID(ctx, id[:])
 		if err != nil {
-			if errors.Is(err, sql.ErrNoRows) ||
-				errors.Is(err, pgx.ErrNoRows) {
-
+			if errors.Is(err, sql.ErrNoRows) {
 				return nil, nil
 			}