fix(storage): fix golangci-lint errors

- G115: safe int->uint64 conversion via safeUint64 helper
- nlreturn: add blank lines before return in tcondition, wallet, wallet_test_utils
- testifylint: use require.NoError for error assertions in querybuilder_test

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Siddhi Khandelwal <siddhi.200727@gmail.com>

Author: sid200727

token/services/storage/db/sql/common/querybuilder_test.go

@@ -17,6 +17,7 @@ import (
 	driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTransactionSql(t *testing.T) {
@@ -127,7 +128,7 @@ func TestTransactionSql(t *testing.T) {
 				return
 			}
 			actualSql, actualArgs, err := evalSqlizer(sqlizer)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expectedSql, actualSql)
 			compareArgs(t, tc.expectedArgs, actualArgs)
 		})
@@ -244,7 +245,7 @@ func TestMovementConditions(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			actualSql, actualArgs, err := evalSqlizer(HasMovementsParams(tc.params))
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expectedSql, actualSql)
 			compareArgs(t, tc.expectedArgs, actualArgs)
 		})
@@ -327,7 +328,7 @@ func TestTokenSql(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			actualSql, actualArgs, err := evalSqlizer(HasTokenDetails(tc.params, ""))
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expectedSql, actualSql, tc.name)
 			assert.Equal(t, tc.expectedArgs, actualArgs)
 		})
@@ -337,7 +338,7 @@ func TestTokenSql(t *testing.T) {
 		IDs:      []*token.ID{{TxId: "a", Index: 1}},
 		WalletID: "me",
 	}, "A"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "(owner = $1 AND (wallet_id IN ($2) OR owner_wallet_id IN ($3)) AND ((A.tx_id = $4 AND A.idx = $5)) AND is_deleted = $6)", where, "join")
 	assert.Len(t, args, 6)
 }
@@ -418,7 +419,7 @@ func TestTokenSqlNoJoin(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			actualSql, actualArgs, err := evalSqlizer(HasTokenDetails(tc.params, ""))
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expectedSql, actualSql, tc.name)
 			assert.Equal(t, tc.expectedArgs, actualArgs)
 		})

token/services/storage/db/sql/common/tcondition.go

@@ -22,6 +22,7 @@ func HasTokens(colTxID, colIdx string, ids ...*token.ID) sq.Sqlizer {
 	for i, id := range ids {
 		or[i] = sq.And{sq.Eq{colTxID: id.TxId}, sq.Eq{colIdx: id.Index}}
 	}
+
 	return or
 }
 

token/services/storage/db/sql/common/transactions.go

@@ -385,7 +385,7 @@ func (db *TransactionStore) ClaimPendingTransactions(ctx context.Context, params
 			sq.Lt{db.table.Transactions + ".stored_at": params.OlderThan},
 		}).
 		OrderBy(db.table.Transactions + ".stored_at ASC").
-		Limit(uint64(params.Limit)).
+		Limit(safeUint64(params.Limit)).
 		PlaceholderFormat(db.pf).
 		ToSql()
 	if err != nil {
@@ -935,3 +935,13 @@ func (panicCI) TimeOffset(_ time.Duration, _ qcommon.Builder) {
 func (panicCI) InTuple(_ []qcommon.Serializable, _ []qcommon.Tuple, _ qcommon.Builder) {
 	panic("InTuple not supported in pagination context")
 }
+
+// safeUint64 converts a non-negative int to uint64.
+// Negative values are clamped to 0 to avoid wrapping.
+func safeUint64(n int) uint64 {
+	if n < 0 {
+		return 0
+	}
+
+	return uint64(n)
+}

token/services/storage/db/sql/common/wallet.go

@@ -134,6 +134,7 @@ func (db *WalletStore) IdentityExists(ctx context.Context, identity token.Identi
 		PlaceholderFormat(db.pf).ToSql()
 	if err != nil {
 		logger.Errorf("failed building query for wallet-identity [%s-%s]: %v", wID, idHash, err)
+
 		return false
 	}
 	result, err := common.QueryUnique[driver.WalletID](db.readDB, query, args...)

token/services/storage/db/sql/common/wallet_test_utils.go

@@ -157,5 +157,6 @@ func sqlPattern(pf sq.PlaceholderFormat, query string) string {
 	if err != nil {
 		return query
 	}
+
 	return regexp.QuoteMeta(replaced)
 }