@@ -307,7 +307,7 @@ func (pgb *ChainDB) timeoutError() string {
307307// replaces a sql.ErrNoRows with a dbtypes.ErrNoResult.
308308func (pgb * ChainDB ) replaceCancelError (err error ) error {
309309 if err == nil {
310- return err
310+ return nil
311311 }
312312
313313 if errors .Is (err , sql .ErrNoRows ) {
@@ -5036,7 +5036,7 @@ func (pgb *ChainDB) GetVoteInfo(txhash *chainhash.Hash) (*apitypes.VoteInfo, err
50365036 tx , err := pgb .Client .GetRawTransaction (pgb .ctx , txhash )
50375037 if err != nil {
50385038 log .Errorf ("GetRawTransaction failed for: %v" , txhash )
5039- return nil , nil
5039+ return nil , err
50405040 }
50415041
50425042 validation , version , bits , choices , tspendVotes , err := txhelpers .SSGenVoteChoices (tx .MsgTx (), pgb .chainParams )
@@ -5618,7 +5618,6 @@ func (pgb *ChainDB) GetAddressTransactionsRawWithSkip(addr string, count, skip i
56185618 log .Errorf ("GetAddressTransactionsRawWithSkip: SelectVinsForAddress %s: %v" , addr , err )
56195619 return nil
56205620 }
5621- defer rows .Close ()
56225621
56235622 type vinIndexed struct {
56245623 * apitypes.VinShort
@@ -5633,6 +5632,7 @@ func (pgb *ChainDB) GetAddressTransactionsRawWithSkip(addr string, count, skip i
56335632 if err = rows .Scan (& txid , & idx , & vinTxID , & vin .Vout , & vin .Tree , & val ,
56345633 & vin .BlockHeight , & vin .BlockIndex ); err != nil {
56355634 log .Errorf ("GetAddressTransactionsRawWithSkip: SelectVinsForAddress %s: %v" , addr , err )
5635+ rows .Close ()
56365636 return nil
56375637 }
56385638 vin .Txid = vinTxID .String ()
@@ -5643,14 +5643,21 @@ func (pgb *ChainDB) GetAddressTransactionsRawWithSkip(addr string, count, skip i
56435643 // Coinbase, Stakebase, etc. booleans are set on TxType detection below.
56445644 vins [txid ] = append (vins [txid ], & vinIndexed {& vin , idx })
56455645 }
5646+ if err = rows .Err (); err != nil {
5647+ log .Errorf ("GetAddressTransactionsRawWithSkip: %v" , err )
5648+ return nil
5649+ }
5650+ if err = rows .Close (); err != nil {
5651+ log .Errorf ("GetAddressTransactionsRawWithSkip: %v" , err )
5652+ return nil
5653+ }
56465654
56475655 // tx
56485656 rows , err = pgb .db .QueryContext (ctx , internal .SelectAddressTxns , addr , count , skip )
56495657 if err != nil {
56505658 log .Errorf ("GetAddressTransactionsRawWithSkip: SelectAddressTxns %s: %v" , addr , err )
56515659 return nil
56525660 }
5653- defer rows .Close ()
56545661
56555662 txns := make (map [dbtypes.ChainHash ]* apitypes.AddressTxRaw )
56565663
@@ -5663,6 +5670,7 @@ func (pgb *ChainDB) GetAddressTransactionsRawWithSkip(addr string, count, skip i
56635670 if err = rows .Scan (& txid , & blockHash , & blockHeight ,
56645671 & tx .Time .S , & tx .Version , & tx .Locktime , & tx .Size , & tx .Type , & numVins , & numVouts /*, &vinDbIDs, &voutDbIDs*/ ); err != nil {
56655672 log .Errorf ("GetAddressTransactionsRawWithSkip: Scan %s: %v" , addr , err )
5673+ rows .Close ()
56665674 return nil
56675675 }
56685676 tx .TxID = txid .String ()
@@ -5701,21 +5709,29 @@ func (pgb *ChainDB) GetAddressTransactionsRawWithSkip(addr string, count, skip i
57015709
57025710 txs = append (txs , & tx )
57035711 }
5712+ if err = rows .Err (); err != nil {
5713+ log .Errorf ("GetAddressTransactionsRawWithSkip: %v" , err )
5714+ return nil
5715+ }
5716+ if err = rows .Close (); err != nil {
5717+ log .Errorf ("GetAddressTransactionsRawWithSkip: %v" , err )
5718+ return nil
5719+ }
57045720
57055721 // vouts
57065722 rows , err = pgb .db .QueryContext (ctx , internal .SelectVoutsForAddress , addr , count , skip )
57075723 if err != nil {
57085724 log .Errorf ("GetAddressTransactionsRawWithSkip: SelectVoutsForAddress %s: %v" , addr , err )
57095725 return nil
57105726 }
5711- defer rows .Close ()
57125727
57135728 for rows .Next () {
57145729 var txid dbtypes.ChainHash // funding tx
57155730 var vout apitypes.Vout
57165731 var val int64
57175732 if err = rows .Scan (& val , & txid , & vout .N , & vout .Version ); err != nil {
57185733 log .Errorf ("GetAddressTransactionsRawWithSkip: SelectVoutsForAddress %s: %v" , addr , err )
5734+ rows .Close ()
57195735 return nil
57205736 }
57215737
@@ -5733,6 +5749,14 @@ func (pgb *ChainDB) GetAddressTransactionsRawWithSkip(addr string, count, skip i
57335749 // vout.ScriptPubKeyDecoded = decPkScript(vout.Version, pkScript, isTicketCommit, pgb.chainParams)
57345750 tx .Vout = append (tx .Vout , vout )
57355751 }
5752+ if err = rows .Err (); err != nil {
5753+ log .Errorf ("GetAddressTransactionsRawWithSkip: %v" , err )
5754+ return nil
5755+ }
5756+ if err = rows .Close (); err != nil {
5757+ log .Errorf ("GetAddressTransactionsRawWithSkip: %v" , err )
5758+ return nil
5759+ }
57365760
57375761 // Get pkscripts that db doesn't have.
57385762 for hash , atx := range txns {
0 commit comments