diff --git a/blockchain/v1/reactor.go b/blockchain/v1/reactor.go index c9982aafe..8c0cc0ddd 100644 --- a/blockchain/v1/reactor.go +++ b/blockchain/v1/reactor.go @@ -306,7 +306,9 @@ func (bcR *BlockchainReactor) NewReceive(e p2p.Envelope) { } } -func (bcR *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (bcR *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + bcR.NewReceive(p2p.Envelope{}) +} // processBlocksRoutine processes blocks until signlaed to stop over the stopProcessing channel func (bcR *BlockchainReactor) processBlocksRoutine(stopProcessing chan struct{}) { diff --git a/blockchain/v2/reactor.go b/blockchain/v2/reactor.go index fceec1c02..0bab59cf7 100644 --- a/blockchain/v2/reactor.go +++ b/blockchain/v2/reactor.go @@ -513,7 +513,9 @@ func (r *BlockchainReactor) NewReceive(e p2p.Envelope) { } } -func (r *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (r *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + r.NewReceive(p2p.Envelope{}) +} // AddPeer implements Reactor interface func (r *BlockchainReactor) AddPeer(peer p2p.Peer) { diff --git a/blocksync/reactor.go b/blocksync/reactor.go index f3d14f06c..c5161ee32 100644 --- a/blocksync/reactor.go +++ b/blocksync/reactor.go @@ -233,7 +233,9 @@ func (bcR *Reactor) NewReceive(e p2p.Envelope) { } } -func (bcR *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (bcR *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + bcR.NewReceive(p2p.Envelope{}) +} // Handle messages from the poolReactor telling the reactor what to do. // NOTE: Don't sleep in the FOR_LOOP or otherwise slow it down! diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index 9a4ff01d4..ba68aea73 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -602,7 +602,9 @@ func (br *ByzantineReactor) RemovePeer(peer p2p.Peer, reason interface{}) { func (br *ByzantineReactor) NewReceive(e p2p.Envelope) { br.reactor.NewReceive(e) } -func (br *ByzantineReactor) Receive(chID byte, p p2p.Peer, m []byte) { +func (br *ByzantineReactor) Receive(chID byte, p p2p.Peer, m []byte) +br.NewReceive(p2p.Envelope{}) +{ br.reactor.Receive(chID, p, m) } func (br *ByzantineReactor) InitPeer(peer p2p.Peer) p2p.Peer { return peer } diff --git a/consensus/reactor.go b/consensus/reactor.go index 40d71236b..d33ea5846 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -387,7 +387,9 @@ func (conR *Reactor) NewReceive(e p2p.Envelope) { } } -func (conR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (conR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + conR.NewReceive(p2p.Envelope{}) +} // SetEventBus sets event bus. func (conR *Reactor) SetEventBus(b *types.EventBus) { diff --git a/evidence/reactor.go b/evidence/reactor.go index 8d7cef24b..a5d773359 100644 --- a/evidence/reactor.go +++ b/evidence/reactor.go @@ -92,7 +92,9 @@ func (evR *Reactor) NewReceive(e p2p.Envelope) { } } -func (evR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (evR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + evR.NewReceive(p2p.Envelope{}) +} // SetEventBus implements events.Eventable. func (evR *Reactor) SetEventBus(b *types.EventBus) { diff --git a/mempool/v1/reactor.go b/mempool/v1/reactor.go index c412375f2..05dbe315c 100644 --- a/mempool/v1/reactor.go +++ b/mempool/v1/reactor.go @@ -187,7 +187,9 @@ func (memR *Reactor) NewReceive(e p2p.Envelope) { // broadcasting happens from go routines per peer } -func (memR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (memR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + memR.NewReceive(p2p.Envelope{}) +} // PeerState describes the state of a peer. type PeerState interface { diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index 80e995e56..cbcf57404 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -82,7 +82,5 @@ func (*BaseReactor) GetChannels() []*conn.ChannelDescriptor { return nil func (*BaseReactor) AddPeer(peer Peer) {} func (*BaseReactor) RemovePeer(peer Peer, reason interface{}) {} func (*BaseReactor) NewReceive(e Envelope) {} - -func (*BaseReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {}} func (*BaseReactor) Receive(chID byte, peer Peer, msgBytes []byte) {} func (*BaseReactor) InitPeer(peer Peer) Peer { return peer } diff --git a/p2p/mock/reactor.go b/p2p/mock/reactor.go index 7e4d608d2..893ed2032 100644 --- a/p2p/mock/reactor.go +++ b/p2p/mock/reactor.go @@ -19,9 +19,8 @@ func NewReactor() *Reactor { return r } -func (r *Reactor) GetChannels() []*conn.ChannelDescriptor { return r.Channels } -func (r *Reactor) AddPeer(peer p2p.Peer) {} -func (r *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) {} -func (r *Reactor) NewReceive(e p2p.Envelope) {} - -func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {}} +func (r *Reactor) GetChannels() []*conn.ChannelDescriptor { return r.Channels } +func (r *Reactor) AddPeer(peer p2p.Peer) {} +func (r *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) {} +func (r *Reactor) NewReceive(e p2p.Envelope) {} +func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go index 926da8633..72b1a4858 100644 --- a/p2p/pex/pex_reactor.go +++ b/p2p/pex/pex_reactor.go @@ -298,7 +298,9 @@ func (r *Reactor) NewReceive(e p2p.Envelope) { } } -func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + r.NewReceive(p2p.Envelope{}) +} // enforces a minimum amount of time between requests func (r *Reactor) receiveRequest(src Peer) error { diff --git a/p2p/switch_test.go b/p2p/switch_test.go index 9b95d7cfb..5de846767 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -82,7 +82,9 @@ func (tr *TestReactor) NewReceive(e Envelope) { } } -func (tr *TestReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (tr *TestReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + tr.NewReceive(p2p.Envelope{}) +} func (tr *TestReactor) getMsgs(chID byte) []PeerMessage { tr.mtx.Lock() diff --git a/statesync/reactor.go b/statesync/reactor.go index 7b80b3b34..cd81766fa 100644 --- a/statesync/reactor.go +++ b/statesync/reactor.go @@ -223,7 +223,9 @@ func (r *Reactor) NewReceive(e p2p.Envelope) { } } -func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + r.NewReceive(p2p.Envelope{}) +} // recentSnapshots fetches the n most recent snapshots from the app func (r *Reactor) recentSnapshots(n uint32) ([]*snapshot, error) { diff --git a/test/maverick/consensus/reactor.go b/test/maverick/consensus/reactor.go index 789b478cf..f1bd8c797 100644 --- a/test/maverick/consensus/reactor.go +++ b/test/maverick/consensus/reactor.go @@ -387,7 +387,9 @@ func (conR *Reactor) NewReceive(e p2p.Envelope) { } } -func (conR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {} +func (conR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) { + conR.NewReceive(p2p.Envelope{}) +} // SetEventBus sets event bus. func (conR *Reactor) SetEventBus(b *types.EventBus) {