From b19acfb605d1fdfc88241b779d1b72af638fff87 Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Tue, 26 Jan 2021 12:33:26 -0500 Subject: [PATCH] mempool: fix TestReactorNoBroadcastToSender (#5984) ## Description Looks like I missed a test in the original PR when fixing the tests. Closes: #5956 --- mempool/reactor.go | 5 +++++ mempool/reactor_test.go | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mempool/reactor.go b/mempool/reactor.go index f6ae9dc9c..151ef8ca8 100644 --- a/mempool/reactor.go +++ b/mempool/reactor.go @@ -224,11 +224,16 @@ func (r *Reactor) processMempoolCh() { case envelope := <-r.mempoolCh.In(): if err := r.handleMessage(r.mempoolCh.ID(), envelope); err != nil { r.Logger.Error("failed to process message", "ch_id", r.mempoolCh.ID(), "envelope", envelope, "err", err) + + fmt.Println("MESSAGE HANDLER ERROR:", err) + r.mempoolCh.Error() <- p2p.PeerError{ PeerID: envelope.From, Err: err, Severity: p2p.PeerErrorSeverityLow, } + + fmt.Println("SENT PEER ERROR ON CHANNEL") } case <-r.closeCh: diff --git a/mempool/reactor_test.go b/mempool/reactor_test.go index 3fe4d8241..bcb6bcfef 100644 --- a/mempool/reactor_test.go +++ b/mempool/reactor_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/fortytw2/leaktest" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/abci/example/kvstore" @@ -287,6 +286,12 @@ func TestReactorNoBroadcastToSender(t *testing.T) { primary := testSuites[0] secondary := testSuites[1] + go func() { + // drop all errors on the mempool channel + for range primary.mempoolPeerErrCh { + } + }() + peerID := uint16(1) _ = checkTxs(t, primary.reactor.mempool, numTxs, peerID) @@ -454,8 +459,4 @@ func TestBroadcastTxForPeerStopsWhenPeerStops(t *testing.T) { Status: p2p.PeerStatusDown, PeerID: secondary.peerID, } - - // check that we are not leaking any go-routines - // i.e. broadcastTxRoutine finishes when peer is stopped - leaktest.CheckTimeout(t, 10*time.Second)() }