Fix lint error: should use a simple channel receive

2 files changed, 20 insertions, 26 deletions

diff --git a/dex/consensus/core/consensus.go b/dex/consensus/core/consensus.go
index 1fcc033eb..2b560db3e 100644
--- a/dex/consensus/core/consensus.go
+++ b/dex/consensus/core/consensus.go
@@ -1049,9 +1049,7 @@ func (con *Consensus) Run() {
 	con.waitGroup.Add(1)
 	go con.deliveryGuard()
 	// Block until done.
-	select {
-	case <-con.ctx.Done():
-	}
+	<-con.ctx.Done()
 }
 
 func (con *Consensus) generateBlockRandomness(blocks []*types.Block) {
diff --git a/dex/consensus/core/test/transport_test.go b/dex/consensus/core/test/transport_test.go
index 2b33b2033..40d0a24d4 100644
--- a/dex/consensus/core/test/transport_test.go
+++ b/dex/consensus/core/test/transport_test.go
@@ -102,16 +102,14 @@ func (s *TransportTestSuite) baseTest(
 		defer wg.Done()
 		server.peerBlocks = make(map[types.NodeID]*types.Block)
 		for {
-			select {
-			case e := <-server.recv:
-				req.Equal(e.PeerType, TransportPeer)
-				switch v := e.Msg.(type) {
-				case *types.Block:
-					req.Equal(v.ProposerID, e.From)
-					server.peerBlocks[v.ProposerID] = v
-					// Echo the block back
-					server.trans.Send(v.ProposerID, v)
-				}
+			e := <-server.recv
+			req.Equal(e.PeerType, TransportPeer)
+			switch v := e.Msg.(type) {
+			case *types.Block:
+				req.Equal(v.ProposerID, e.From)
+				server.peerBlocks[v.ProposerID] = v
+				// Echo the block back
+				server.trans.Send(v.ProposerID, v)
 			}
 			// Upon receiving blocks from all peers, stop.
 			if len(server.peerBlocks) == len(peers) {
@@ -124,19 +122,17 @@ func (s *TransportTestSuite) baseTest(
 		peer.blocks = make(map[types.NodeID]*types.Block)
 		peer.blocksReceiveTime = make(map[common.Hash]time.Time)
 		for {
-			select {
-			case e := <-peer.recv:
-				switch v := e.Msg.(type) {
-				case *types.Block:
-					if v.ProposerID == peer.nID {
-						req.Equal(e.PeerType, TransportPeerServer)
-						peer.echoBlock = v
-					} else {
-						req.Equal(e.PeerType, TransportPeer)
-						req.Equal(e.From, v.ProposerID)
-						peer.blocks[v.ProposerID] = v
-						peer.blocksReceiveTime[v.Hash] = time.Now()
-					}
+			e := <-peer.recv
+			switch v := e.Msg.(type) {
+			case *types.Block:
+				if v.ProposerID == peer.nID {
+					req.Equal(e.PeerType, TransportPeerServer)
+					peer.echoBlock = v
+				} else {
+					req.Equal(e.PeerType, TransportPeer)
+					req.Equal(e.From, v.ProposerID)
+					peer.blocks[v.ProposerID] = v
+					peer.blocksReceiveTime[v.Hash] = time.Now()
 				}
 			}
 			// Upon receiving blocks from all other peers, and echoed from