From a6e7b358726f4f7e4beab167abf00b0d9cc9ae8c Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Thu, 12 Jul 2018 17:39:59 -0700 Subject: [PATCH] server: use blocking RemoveLink to shutdown links --- server.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server.go b/server.go index 565f66d6f..2729fa76c 100644 --- a/server.go +++ b/server.go @@ -646,7 +646,8 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl, ChainIO: cc.chainIO, MarkLinkInactive: func(chanPoint wire.OutPoint) error { chanID := lnwire.NewChanIDFromOutPoint(&chanPoint) - return s.htlcSwitch.RemoveLink(chanID) + s.htlcSwitch.RemoveLink(chanID) + return nil }, IsOurAddress: func(addr btcutil.Address) bool { _, err := cc.wallet.GetPrivKey(addr) @@ -1960,11 +1961,7 @@ func (s *server) peerTerminationWatcher(p *peer) { } for _, link := range links { - err := p.server.htlcSwitch.RemoveLink(link.ChanID()) - if err != nil { - srvrLog.Errorf("unable to remove channel link: %v", - err) - } + p.server.htlcSwitch.RemoveLink(link.ChanID()) } s.mu.Lock()