further consolidation

blocksync/reactor.go

@@ -452,11 +452,10 @@ func (bcR *Reactor) BroadcastStatusRequest() error {
 		bcR.Logger.Error("could not convert msg to proto message", "err", err)
 		return fmt.Errorf("could not convert msg to proto message: %w", err)
 	}
-	e := p2p.Envelope{
+	bcR.Switch.NewBroadcast(p2p.Envelope{
 		ChannelID: BlocksyncChannel,
 		Message:   wm,
-	}
-	bcR.Switch.NewBroadcast(e)
+	})
 
 	return nil
 }

evidence/reactor.go

@@ -159,11 +159,11 @@ func (evR *Reactor) broadcastEvidenceRoutine(peer p2p.Peer) {
 			if err != nil {
 				panic(err)
 			}
-			e := p2p.Envelope{
+
+			success := peer.Send(p2p.Envelope{
 				ChannelID: EvidenceChannel,
 				Message:   evp,
-			}
-			success := peer.Send(e)
+			})
 			if !success {
 				time.Sleep(peerRetryMessageIntervalMS * time.Millisecond)
 				continue

mempool/v0/reactor.go

@@ -262,15 +262,14 @@ func (memR *Reactor) broadcastTxRoutine(peer p2p.Peer) {
 		// https://github.com/tendermint/tendermint/issues/5796
 
 		if _, ok := memTx.senders.Load(peerID); !ok {
-			e := p2p.Envelope{
+			success := peer.Send(p2p.Envelope{
 				ChannelID: mempool.MempoolChannel,
 				Message: &protomem.Message{
 					Sum: &protomem.Message_Txs{
 						Txs: &protomem.Txs{Txs: [][]byte{memTx.tx}},
 					},
 				},
-			}
-			success := peer.Send(e)
+			})
 			if !success {
 				time.Sleep(mempool.PeerCatchupSleepIntervalMS * time.Millisecond)
 				continue

mempool/v1/reactor.go

@@ -263,17 +263,14 @@ func (memR *Reactor) broadcastTxRoutine(peer p2p.Peer) {
 		// NOTE: Transaction batching was disabled due to
 		// https://github.com/tendermint/tendermint/issues/5796
 		if !memTx.HasPeer(peerID) {
-
-			e := p2p.Envelope{
+			success := peer.Send(p2p.Envelope{
 				ChannelID: mempool.MempoolChannel,
 				Message: &protomem.Message{
 					Sum: &protomem.Message_Txs{
 						Txs: &protomem.Txs{Txs: [][]byte{memTx.tx}},
 					},
 				},
-			}
-
-			success := peer.Send(e)
+			})
 			if !success {
 				time.Sleep(mempool.PeerCatchupSleepIntervalMS * time.Millisecond)
 				continue