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

peer: remove no longer needed block epoch

Browse Source
This commit is contained in:
Wilmer Paulino 2018-06-11 19:05:00 -07:00
parent 9ecfdb3c32
commit 90a50bd893
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
peer.go
View File

@ -343,11 +343,6 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
continue
}
blockEpoch, err := p.server.cc.chainNotifier.RegisterBlockEpochNtfn()
if err != nil {
lnChan.Stop()
return err
}
_, currentHeight, err := p.server.cc.chainIO.GetBestBlock()
if err != nil {
lnChan.Stop()
@ -410,8 +405,8 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
// Create the link and add it to the switch.
err = p.addLink(
chanPoint, lnChan, forwardingPolicy, blockEpoch,
chainEvents, currentHeight, true,
chanPoint, lnChan, forwardingPolicy, chainEvents,
currentHeight, true,
)
if err != nil {
lnChan.Stop()
@ -430,7 +425,6 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
func (p *peer) addLink(chanPoint *wire.OutPoint,
lnChan *lnwallet.LightningChannel,
forwardingPolicy *htlcswitch.ForwardingPolicy,
blockEpoch *chainntnfs.BlockEpochEvent,
chainEvents *contractcourt.ChainEventSubscription,
currentHeight int32, syncStates bool) error {
@ -1503,11 +1497,6 @@ out:
// necessary items it needs to function.
//
// TODO(roasbeef): panic on below?
blockEpoch, err := p.server.cc.chainNotifier.RegisterBlockEpochNtfn()
if err != nil {
peerLog.Errorf("unable to register for block epoch: %v", err)
continue
}
_, currentHeight, err := p.server.cc.chainIO.GetBestBlock()
if err != nil {
peerLog.Errorf("unable to get best block: %v", err)
@ -1523,9 +1512,10 @@ out:
}
// Create the link and add it to the switch.
err = p.addLink(chanPoint, newChan,
&p.server.cc.routingPolicy, blockEpoch,
chainEvents, currentHeight, false)
err = p.addLink(
chanPoint, newChan, &p.server.cc.routingPolicy,
chainEvents, currentHeight, false,
)
if err != nil {
peerLog.Errorf("can't register new channel "+
"link(%v) with NodeKey(%x): %v", chanPoint,