From 0a3fdf0271f8b3dc6795aa01e4deb2386e56a59e Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Tue, 14 Apr 2020 22:34:16 -0700 Subject: [PATCH 1/2] htlcswitch/test_utils: extend PendingCommit timeout Flakes locally on darwin. --- htlcswitch/test_utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index c591e65b..614abce6 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -1167,7 +1167,7 @@ func (h *hopNetwork) createChannelLink(server, peer *mockServer, BatchSize: 10, BatchTicker: ticker.NewForce(testBatchTimeout), FwdPkgGCTicker: ticker.NewForce(fwdPkgTimeout), - PendingCommitTicker: ticker.NewForce(time.Minute), + PendingCommitTicker: ticker.NewForce(2 * time.Minute), MinFeeUpdateTimeout: minFeeUpdateTimeout, MaxFeeUpdateTimeout: maxFeeUpdateTimeout, OnChannelFailure: func(lnwire.ChannelID, lnwire.ShortChannelID, LinkFailureError) {}, From b467f549b72105eae214b4e799f437cc219819e0 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Tue, 14 Apr 2020 22:33:53 -0700 Subject: [PATCH 2/2] htlcswitch/link: return error from AddPacket --- htlcswitch/link.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htlcswitch/link.go b/htlcswitch/link.go index c7a86c1e..3290573a 100644 --- a/htlcswitch/link.go +++ b/htlcswitch/link.go @@ -2309,8 +2309,7 @@ func (l *channelLink) HandleSwitchPacket(pkt *htlcPacket) error { l.log.Tracef("received switch packet inkey=%v, outkey=%v", pkt.inKey(), pkt.outKey()) - l.mailBox.AddPacket(pkt) - return nil + return l.mailBox.AddPacket(pkt) } // HandleChannelUpdate handles the htlc requests as settle/add/fail which sent