Skip to content

Commit

Permalink
Fix an incorrectly thrown error given by the address indexer
Browse files Browse the repository at this point in the history
The address indexer would throw an error that would break indexing for a
block if it encountered an unparseable input or output script. Now it
skips the script and continues.
  • Loading branch information
cjepson committed Feb 11, 2016
1 parent 216aa75 commit 01e9bfd
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions chainindexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func convertToAddrIndex(scrVersion uint16, scr []byte, height int64,
class, addrs, _, err := txscript.ExtractPkScriptAddrs(scrVersion, scr,
activeNetParams.Params)
if err != nil {
return nil, fmt.Errorf("script conversion error")
return nil, fmt.Errorf("script conversion error: %v", err.Error())
}
knownType := false
for _, addr := range addrs {
Expand Down Expand Up @@ -353,9 +353,9 @@ func (a *addrIndexer) indexBlockAddrs(blk *dcrutil.Block,
toAppend, err := convertToAddrIndex(inputOutPoint.Version,
inputOutPoint.PkScript, parent.Height(), locInBlock)
if err != nil {
adxrLog.Errorf("Error converting tx %v: %v",
adxrLog.Tracef("Error converting tx txin %v: %v",
txIn.PreviousOutPoint.Hash, err)
return nil, err
continue
}
addrIndex = append(addrIndex, toAppend...)
}
Expand All @@ -365,9 +365,9 @@ func (a *addrIndexer) indexBlockAddrs(blk *dcrutil.Block,
toAppend, err := convertToAddrIndex(txOut.Version, txOut.PkScript,
parent.Height(), locInBlock)
if err != nil {
adxrLog.Errorf("Error converting tx %v: %v",
adxrLog.Tracef("Error converting tx txout %v: %v",
tx.MsgTx().TxSha(), err)
return nil, err
continue
}
addrIndex = append(addrIndex, toAppend...)
}
Expand Down Expand Up @@ -399,9 +399,9 @@ func (a *addrIndexer) indexBlockAddrs(blk *dcrutil.Block,
toAppend, err := convertToAddrIndex(inputOutPoint.Version,
inputOutPoint.PkScript, blk.Height(), locInBlock)
if err != nil {
adxrLog.Errorf("Error converting stx %v: %v",
adxrLog.Tracef("Error converting stx txin %v: %v",
txIn.PreviousOutPoint.Hash, err)
return nil, err
continue
}
addrIndex = append(addrIndex, toAppend...)
}
Expand All @@ -410,9 +410,9 @@ func (a *addrIndexer) indexBlockAddrs(blk *dcrutil.Block,
toAppend, err := convertToAddrIndex(txOut.Version, txOut.PkScript,
blk.Height(), locInBlock)
if err != nil {
adxrLog.Errorf("Error converting stx %v: %v",
adxrLog.Tracef("Error converting stx txout %v: %v",
stx.MsgTx().TxSha(), err)
return nil, err
continue
}
addrIndex = append(addrIndex, toAppend...)
}
Expand Down

0 comments on commit 01e9bfd

Please sign in to comment.