routing: when updating chain view filter on restart, use best height as height hint

In this commit, we modify the high value passed into UpdateFilter upon
restart. Before this commit, we would pass in the prune height, which
would cause a full rescan within the FilteredChainView if the best
height as > than the prune height. This was redundant as we would
shortly carry out a manual rescan in the method below. To fix this, we
now pass in the bestHeight, this isn’t an issue as the
syncGraphWithChain method will manually scan up to that best height.
This commit is contained in:
Olaoluwa Osuntokun 2017-11-29 16:26:32 -08:00
parent 978023ab1d
commit fcd5e4aa41
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21

@ -273,8 +273,12 @@ func (r *ChannelRouter) Start() error {
r.newBlocks = r.cfg.ChainView.FilteredBlocks()
r.staleBlocks = r.cfg.ChainView.DisconnectedBlocks()
_, pruneHeight, err := r.cfg.Graph.PruneTip()
bestHash, bestHeight, err := r.cfg.Chain.GetBestBlock()
if err != nil {
return err
}
if _, _, err := r.cfg.Graph.PruneTip(); err != nil {
switch {
// If the graph has never been pruned, or hasn't fully been
// created yet, then we don't treat this as an explicit error.
@ -284,11 +288,6 @@ func (r *ChannelRouter) Start() error {
// If the graph has never been pruned, then we'll set
// the prune height to the current best height of the
// chain backend.
bestHash, bestHeight, err := r.cfg.Chain.GetBestBlock()
if err != nil {
return err
}
_, err = r.cfg.Graph.PruneGraph(
nil, bestHash, uint32(bestHeight),
)
@ -311,7 +310,9 @@ func (r *ChannelRouter) Start() error {
log.Infof("Filtering chain using %v channels active", len(channelView))
if len(channelView) != 0 {
err = r.cfg.ChainView.UpdateFilter(channelView, pruneHeight)
err = r.cfg.ChainView.UpdateFilter(
channelView, uint32(bestHeight),
)
if err != nil {
return err
}