diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index 06d31eeba..92ac8889e 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -596,7 +596,7 @@ func (br *ByzantineReactor) AddPeer(peer p2p.Peer) { func (br *ByzantineReactor) RemovePeer(peer p2p.Peer, reason interface{}) { br.reactor.RemovePeer(peer, reason) } -func (br *ByzantineReactor) NewReceive(e p2p.Envelope) { - br.reactor.NewReceive(e) +func (br *ByzantineReactor) Receive(e p2p.Envelope) { + br.reactor.Receive(e) } func (br *ByzantineReactor) InitPeer(peer p2p.Peer) p2p.Peer { return peer } diff --git a/consensus/reactor.go b/consensus/reactor.go index c81d8001b..d2b1dad6b 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -227,7 +227,7 @@ func (conR *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) { // Peer state updates can happen in parallel, but processing of // proposals, block parts, and votes are ordered by the receiveRoutine // NOTE: blocks on consensus state for proposals, block parts, and votes -func (conR *Reactor) NewReceive(e p2p.Envelope) { +func (conR *Reactor) Receive(e p2p.Envelope) { if !conR.IsRunning() { conR.Logger.Debug("Receive", "src", e.Src, "chId", e.ChannelID) return diff --git a/evidence/reactor.go b/evidence/reactor.go index adf8bcfe9..c82a713d3 100644 --- a/evidence/reactor.go +++ b/evidence/reactor.go @@ -68,7 +68,7 @@ func (evR *Reactor) AddPeer(peer p2p.Peer) { // Receive implements Reactor. // It adds any received evidence to the evpool. -func (evR *Reactor) NewReceive(e p2p.Envelope) { +func (evR *Reactor) Receive(e p2p.Envelope) { evis, err := evidenceListFromProto(e.Message) if err != nil { evR.Logger.Error("Error decoding message", "src", e.Src, "chId", e.ChannelID, "err", err) diff --git a/mempool/v0/reactor.go b/mempool/v0/reactor.go index 9583ffb5f..07d3cd1b6 100644 --- a/mempool/v0/reactor.go +++ b/mempool/v0/reactor.go @@ -156,7 +156,7 @@ func (memR *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) { // Receive implements Reactor. // It adds any received transactions to the mempool. -func (memR *Reactor) NewReceive(e p2p.Envelope) { +func (memR *Reactor) Receive(e p2p.Envelope) { msg, err := msgFromProto(e.Message) if err != nil { memR.Logger.Error("Error decoding message", "src", e.Src, "chId", e.ChannelID, "err", err) diff --git a/mempool/v1/reactor.go b/mempool/v1/reactor.go index 0be1ded37..e2f82ab84 100644 --- a/mempool/v1/reactor.go +++ b/mempool/v1/reactor.go @@ -156,7 +156,7 @@ func (memR *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) { // Receive implements Reactor. // It adds any received transactions to the mempool. -func (memR *Reactor) NewReceive(e p2p.Envelope) { +func (memR *Reactor) Receive(e p2p.Envelope) { msg, err := protoToMsg(e.Message) if err != nil { memR.Logger.Error("Error decoding message", "src", e.Src, "chId", e.ChannelID, "err", err) diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index e36dc7f01..2792b6889 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -44,7 +44,7 @@ type Reactor interface { // copying. // // CONTRACT: msgBytes are not nil. - NewReceive(Envelope) + Receive(Envelope) } //-------------------------------------- @@ -67,5 +67,5 @@ func (br *BaseReactor) SetSwitch(sw *Switch) { 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(e Envelope) {} func (*BaseReactor) InitPeer(peer Peer) Peer { return peer } diff --git a/p2p/peer.go b/p2p/peer.go index 94eb8beb9..11742fd66 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -422,7 +422,7 @@ func createMConnection( } p.metrics.PeerReceiveBytesTotal.With(labels...).Add(float64(len(msgBytes))) p.metrics.MessageReceiveBytesTotal.With("message_type", "tmp").Add(float64(len(msgBytes))) - reactor.NewReceive(Envelope{ + reactor.Receive(Envelope{ ChannelID: chID, Src: p, Message: msg, diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go index e8f26b433..1f21a9366 100644 --- a/p2p/pex/pex_reactor.go +++ b/p2p/pex/pex_reactor.go @@ -237,7 +237,7 @@ func (r *Reactor) logErrAddrBook(err error) { } // Receive implements Reactor by handling incoming PEX messages. -func (r *Reactor) NewReceive(e p2p.Envelope) { +func (r *Reactor) Receive(e p2p.Envelope) { msg, err := msgFromProto(e.Message) if err != nil { r.Logger.Error("Error decoding message", "src", e.Src, "chId", e.ChannelID, "err", err) diff --git a/statesync/reactor.go b/statesync/reactor.go index 55cbb789b..e43b0c2a4 100644 --- a/statesync/reactor.go +++ b/statesync/reactor.go @@ -101,8 +101,8 @@ func (r *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) { } } -// NewReceive implements p2p.Reactor. -func (r *Reactor) NewReceive(e p2p.Envelope) { +// Receive implements p2p.Reactor. +func (r *Reactor) Receive(e p2p.Envelope) { if !r.IsRunning() { return }