diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index 762b948f9..e36dc7f01 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -38,14 +38,12 @@ type Reactor interface { // or other reason). RemovePeer(peer Peer, reason interface{}) - // Receive is called by the switch when msgBytes is received from the peer. + // Receive is called by the switch when a message is received from the peer. // // NOTE reactor can not keep msgBytes around after Receive completes without // copying. // // CONTRACT: msgBytes are not nil. - Receive(chID byte, peer Peer, msgBytes []byte) - NewReceive(Envelope) } @@ -66,9 +64,8 @@ func NewBaseReactor(name string, impl Reactor) *BaseReactor { func (br *BaseReactor) SetSwitch(sw *Switch) { br.Switch = sw } -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 Peer, msgBytes []byte) {} -func (*BaseReactor) InitPeer(peer Peer) Peer { return peer } +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) InitPeer(peer Peer) Peer { return peer } diff --git a/p2p/peer.go b/p2p/peer.go index 2bf40f8ad..94eb8beb9 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -422,7 +422,6 @@ func createMConnection( } p.metrics.PeerReceiveBytesTotal.With(labels...).Add(float64(len(msgBytes))) p.metrics.MessageReceiveBytesTotal.With("message_type", "tmp").Add(float64(len(msgBytes))) - reactor.Receive(chID, p, msgBytes) reactor.NewReceive(Envelope{ ChannelID: chID, Src: p,