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

Merge pull request #4195 from cfromknecht/mailbox-cancel-fixups

Browse Source 
htlcswitch: mailbox cancel followups
This commit is contained in:
Olaoluwa Osuntokun 2020-04-15 12:30:54 -07:00 committed by GitHub
commit 30b7036709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htlcswitch/link.go
View File

@ -2309,8 +2309,7 @@ func (l *channelLink) HandleSwitchPacket(pkt *htlcPacket) error {
l.log.Tracef("received switch packet inkey=%v, outkey=%v", l.log.Tracef("received switch packet inkey=%v, outkey=%v",
pkt.inKey(), pkt.outKey()) pkt.inKey(), pkt.outKey())
l.mailBox.AddPacket(pkt) return l.mailBox.AddPacket(pkt)
return nil
} }
// HandleChannelUpdate handles the htlc requests as settle/add/fail which sent // HandleChannelUpdate handles the htlc requests as settle/add/fail which sent

2
htlcswitch/test_utils.go
View File

@ -1167,7 +1167,7 @@ func (h *hopNetwork) createChannelLink(server, peer *mockServer,
BatchSize: 10, BatchSize: 10,
BatchTicker: ticker.NewForce(testBatchTimeout), BatchTicker: ticker.NewForce(testBatchTimeout),
FwdPkgGCTicker: ticker.NewForce(fwdPkgTimeout), FwdPkgGCTicker: ticker.NewForce(fwdPkgTimeout),
PendingCommitTicker: ticker.NewForce(time.Minute), PendingCommitTicker: ticker.NewForce(2 * time.Minute),
MinFeeUpdateTimeout: minFeeUpdateTimeout, MinFeeUpdateTimeout: minFeeUpdateTimeout,
MaxFeeUpdateTimeout: maxFeeUpdateTimeout, MaxFeeUpdateTimeout: maxFeeUpdateTimeout,
OnChannelFailure: func(lnwire.ChannelID, lnwire.ShortChannelID, LinkFailureError) {}, OnChannelFailure: func(lnwire.ChannelID, lnwire.ShortChannelID, LinkFailureError) {},