chainntnfs/bitcoind+btcd+neutrino: pass nil conf details

This commit is contained in:
Conner Fromknecht 2018-08-24 19:35:17 -07:00
parent 1babec971f
commit a1756b0b1b
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
3 changed files with 41 additions and 23 deletions

@ -278,14 +278,19 @@ out:
return return
} }
if confDetails != nil { // If the historical dispatch finished
err := b.txConfNotifier.UpdateConfDetails( // without error, we will invoke
*msg.TxID, msg.ConfID, // UpdateConfDetails even if none were
confDetails, // found. This allows the notifier to
) // begin safely updating the height hint
if err != nil { // cache at tip, since any pending
chainntnfs.Log.Error(err) // rescans have now completed.
} err = b.txConfNotifier.UpdateConfDetails(
*msg.TxID, msg.ConfID,
confDetails,
)
if err != nil {
chainntnfs.Log.Error(err)
} }
}() }()

@ -348,14 +348,19 @@ out:
return return
} }
if confDetails != nil { // If the historical dispatch finished
err = b.txConfNotifier.UpdateConfDetails( // without error, we will invoke
*msg.TxID, msg.ConfID, // UpdateConfDetails even if none were
confDetails, // found. This allows the notifier to
) // begin safely updating the height hint
if err != nil { // cache at tip, since any pending
chainntnfs.Log.Error(err) // rescans have now completed.
} err = b.txConfNotifier.UpdateConfDetails(
*msg.TxID, msg.ConfID,
confDetails,
)
if err != nil {
chainntnfs.Log.Error(err)
} }
}() }()

@ -353,14 +353,22 @@ out:
chainntnfs.Log.Error(err) chainntnfs.Log.Error(err)
} }
// If the historical dispatch finished
// without error, we will invoke
// UpdateConfDetails even if none were
// found. This allows the notifier to
// begin safely updating the height hint
// cache at tip, since any pending
// rescans have now completed.
err = n.txConfNotifier.UpdateConfDetails(
*msg.TxID, msg.ConfID,
confDetails,
)
if err != nil {
chainntnfs.Log.Error(err)
}
if confDetails != nil { if confDetails != nil {
err := n.txConfNotifier.UpdateConfDetails(
*msg.TxID, msg.ConfID,
confDetails,
)
if err != nil {
chainntnfs.Log.Error(err)
}
return return
} }