akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chainntnfs/txnotifier: rename hintCache -> confirmHintCache

Browse Source
This commit is contained in:
Wilmer Paulino 2018-10-05 02:07:55 -07:00
parent f65401b439
commit 405e8f0fad
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chainntnfs/txnotifier.go
View File

@ -123,10 +123,10 @@ type TxNotifier struct {
// at which the transaction will have sufficient confirmations. // at which the transaction will have sufficient confirmations.
ntfnsByConfirmHeight map[uint32]map[*ConfNtfn]struct{} ntfnsByConfirmHeight map[uint32]map[*ConfNtfn]struct{}
// hintCache is a cache used to maintain the latest height hints for // confirmHintCache is a cache used to maintain the latest height hints for
// transactions. Each height hint represents the earliest height at // transactions. Each height hint represents the earliest height at
// which the transactions could have been confirmed within the chain. // which the transactions could have been confirmed within the chain.
hintCache ConfirmHintCache confirmHintCache ConfirmHintCache
// quit is closed in order to signal that the notifier is gracefully // quit is closed in order to signal that the notifier is gracefully
// exiting. // exiting.
@ -179,7 +179,7 @@ func newConfNtfnSet() *confNtfnSet {
// NewTxNotifier creates a TxNotifier. The current height of the blockchain is // NewTxNotifier creates a TxNotifier. The current height of the blockchain is
// accepted as a parameter. // accepted as a parameter.
func NewTxNotifier(startHeight uint32, reorgSafetyLimit uint32, func NewTxNotifier(startHeight uint32, reorgSafetyLimit uint32,
hintCache ConfirmHintCache) *TxNotifier { confirmHintCache ConfirmHintCache) *TxNotifier {
return &TxNotifier{ return &TxNotifier{
currentHeight: startHeight, currentHeight: startHeight,
@ -187,7 +187,7 @@ func NewTxNotifier(startHeight uint32, reorgSafetyLimit uint32,
confNotifications: make(map[chainhash.Hash]*confNtfnSet), confNotifications: make(map[chainhash.Hash]*confNtfnSet),
txsByInitialHeight: make(map[uint32]map[chainhash.Hash]struct{}), txsByInitialHeight: make(map[uint32]map[chainhash.Hash]struct{}),
ntfnsByConfirmHeight: make(map[uint32]map[*ConfNtfn]struct{}), ntfnsByConfirmHeight: make(map[uint32]map[*ConfNtfn]struct{}),
hintCache: hintCache, confirmHintCache: confirmHintCache,
quit: make(chan struct{}), quit: make(chan struct{}),
} }
} }
@ -221,7 +221,7 @@ func (n *TxNotifier) RegisterConf(ntfn *ConfNtfn) (*HistoricalConfDispatch, erro
// //
// TODO(conner): verify that all submitted height hints are identical. // TODO(conner): verify that all submitted height hints are identical.
startHeight := ntfn.HeightHint startHeight := ntfn.HeightHint
hint, err := n.hintCache.QueryConfirmHint(*ntfn.TxID) hint, err := n.confirmHintCache.QueryConfirmHint(*ntfn.TxID)
if err == nil { if err == nil {
if hint > startHeight { if hint > startHeight {
Log.Debugf("Using height hint %d retrieved "+ Log.Debugf("Using height hint %d retrieved "+
@ -361,7 +361,7 @@ func (n *TxNotifier) UpdateConfDetails(txid chainhash.Hash,
Log.Debugf("Updating conf details for txid=%v details", txid) Log.Debugf("Updating conf details for txid=%v details", txid)
err := n.hintCache.CommitConfirmHint(details.BlockHeight, txid) err := n.confirmHintCache.CommitConfirmHint(details.BlockHeight, txid)
if err != nil { if err != nil {
// The error is not fatal, so we should not return an error to // The error is not fatal, so we should not return an error to
// the caller. // the caller.
@ -584,7 +584,7 @@ out:
} }
if len(txsToUpdateHints) > 0 { if len(txsToUpdateHints) > 0 {
err := n.hintCache.CommitConfirmHint( err := n.confirmHintCache.CommitConfirmHint(
n.currentHeight, txsToUpdateHints..., n.currentHeight, txsToUpdateHints...,
) )
if err != nil { if err != nil {
@ -684,7 +684,7 @@ func (n *TxNotifier) DisconnectTip(blockHeight uint32) error {
txs = append(txs, tx) txs = append(txs, tx)
} }
err := n.hintCache.CommitConfirmHint(n.currentHeight, txs...) err := n.confirmHintCache.CommitConfirmHint(n.currentHeight, txs...)
if err != nil { if err != nil {
Log.Errorf("Unable to update confirm hint to %d for %v: %v", Log.Errorf("Unable to update confirm hint to %d for %v: %v",
n.currentHeight, txs, err) n.currentHeight, txs, err)