highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-25 17:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

peer: replace NewBatchTicker with ticker.New

Browse Source
This commit is contained in:
Conner Fromknecht 2018-08-01 14:48:32 -07:00
parent c90ec19595
commit 2762546eeb
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
peer.go
View File

@ -25,6 +25,7 @@ import (
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/ticker"
)
var (
@ -417,7 +418,8 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
)
if err != nil {
lnChan.Stop()
return err
return fmt.Errorf("unable to add link %v to switch: %v",
chanPoint, err)
}
p.activeChanMtx.Lock()
@ -545,8 +547,8 @@ func (p *peer) addLink(chanPoint *wire.OutPoint,
},
OnChannelFailure: onChannelFailure,
SyncStates: syncStates,
BatchTicker: htlcswitch.NewBatchTicker(50 * time.Millisecond),
FwdPkgGCTicker: htlcswitch.NewBatchTicker(time.Minute),
BatchTicker: ticker.New(50 * time.Millisecond),
FwdPkgGCTicker: ticker.New(time.Minute),
BatchSize: 10,
UnsafeReplay: cfg.UnsafeReplay,
MinFeeUpdateTimeout: htlcswitch.DefaultMinLinkFeeUpdateTimeout,
@ -576,7 +578,7 @@ func (p *peer) Disconnect(reason error) {
return
}
peerLog.Tracef("Disconnecting %s, reason: %v", p, reason)
peerLog.Debugf("Disconnecting %s, reason: %v", p, reason)
// Ensure that the TCP connection is properly closed before continuing.
p.conn.Close()