diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index afcb71f63..79d40f057 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -602,4 +602,7 @@ 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) { + br.reactor.Receive(chID, p, m) +} func (br *ByzantineReactor) InitPeer(peer p2p.Peer) p2p.Peer { return peer } diff --git a/p2p/mock/peer.go b/p2p/mock/peer.go index 6dd573de7..bafcade22 100644 --- a/p2p/mock/peer.go +++ b/p2p/mock/peer.go @@ -45,6 +45,8 @@ func NewPeer(ip net.IP) *Peer { func (mp *Peer) FlushStop() { mp.Stop() } //nolint:errcheck //ignore error func (mp *Peer) NewTrySend(e p2p.Envelope) bool { return true } func (mp *Peer) NewSend(e p2p.Envelope) bool { return true } +func (mp *Peer) TrySend(_ byte, _ []byte) bool { return true } +func (mp *Peer) Send(_ byte, _ []byte) bool { return true } func (mp *Peer) NodeInfo() p2p.NodeInfo { return p2p.DefaultNodeInfo{ DefaultNodeID: mp.addr.ID, diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index 75d440a65..d2c3747a8 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -262,6 +262,20 @@ func (_m *Peer) Reset() error { return r0 } +// Send provides a mock function with given fields: _a0, _a1 +func (_m *Peer) Send(_a0 byte, _a1 []byte) bool { + ret := _m.Called(_a0, _a1) + + var r0 bool + if rf, ok := ret.Get(0).(func(byte, []byte) bool); ok { + r0 = rf(_a0, _a1) + } else { + r0 = ret.Get(0).(bool) + } + + return r0 +} + // Set provides a mock function with given fields: _a0, _a1 func (_m *Peer) Set(_a0 string, _a1 interface{}) { _m.Called(_a0, _a1) @@ -349,6 +363,20 @@ func (_m *Peer) String() string { return r0 } +// TrySend provides a mock function with given fields: _a0, _a1 +func (_m *Peer) TrySend(_a0 byte, _a1 []byte) bool { + ret := _m.Called(_a0, _a1) + + var r0 bool + if rf, ok := ret.Get(0).(func(byte, []byte) bool); ok { + r0 = rf(_a0, _a1) + } else { + r0 = ret.Get(0).(bool) + } + + return r0 +} + type mockConstructorTestingTNewPeer interface { mock.TestingT Cleanup(func()) diff --git a/p2p/peer_set_test.go b/p2p/peer_set_test.go index 4faca0563..ff2c28d8c 100644 --- a/p2p/peer_set_test.go +++ b/p2p/peer_set_test.go @@ -18,22 +18,24 @@ type mockPeer struct { id ID } -func (mp *mockPeer) FlushStop() { mp.Stop() } //nolint:errcheck // ignore error -func (mp *mockPeer) NewTrySend(e Envelope) bool { return true } -func (mp *mockPeer) NewSend(e Envelope) bool { return true } -func (mp *mockPeer) NodeInfo() NodeInfo { return DefaultNodeInfo{} } -func (mp *mockPeer) Status() ConnectionStatus { return ConnectionStatus{} } -func (mp *mockPeer) ID() ID { return mp.id } -func (mp *mockPeer) IsOutbound() bool { return false } -func (mp *mockPeer) IsPersistent() bool { return true } -func (mp *mockPeer) Get(s string) interface{} { return s } -func (mp *mockPeer) Set(string, interface{}) {} -func (mp *mockPeer) RemoteIP() net.IP { return mp.ip } -func (mp *mockPeer) SocketAddr() *NetAddress { return nil } -func (mp *mockPeer) RemoteAddr() net.Addr { return &net.TCPAddr{IP: mp.ip, Port: 8800} } -func (mp *mockPeer) CloseConn() error { return nil } -func (mp *mockPeer) SetRemovalFailed() {} -func (mp *mockPeer) GetRemovalFailed() bool { return false } +func (mp *mockPeer) FlushStop() { mp.Stop() } //nolint:errcheck // ignore error +func (mp *mockPeer) NewTrySend(e Envelope) bool { return true } +func (mp *mockPeer) NewSend(e Envelope) bool { return true } +func (mp *mockPeer) TrySend(_ byte, _ []byte) bool { return true } +func (mp *mockPeer) Send(_ byte, _ []byte) bool { return true } +func (mp *mockPeer) NodeInfo() NodeInfo { return DefaultNodeInfo{} } +func (mp *mockPeer) Status() ConnectionStatus { return ConnectionStatus{} } +func (mp *mockPeer) ID() ID { return mp.id } +func (mp *mockPeer) IsOutbound() bool { return false } +func (mp *mockPeer) IsPersistent() bool { return true } +func (mp *mockPeer) Get(s string) interface{} { return s } +func (mp *mockPeer) Set(string, interface{}) {} +func (mp *mockPeer) RemoteIP() net.IP { return mp.ip } +func (mp *mockPeer) SocketAddr() *NetAddress { return nil } +func (mp *mockPeer) RemoteAddr() net.Addr { return &net.TCPAddr{IP: mp.ip, Port: 8800} } +func (mp *mockPeer) CloseConn() error { return nil } +func (mp *mockPeer) SetRemovalFailed() {} +func (mp *mockPeer) GetRemovalFailed() bool { return false } // Returns a mock peer func newMockPeer(ip net.IP) *mockPeer {