Browse Source
mempool: add a safety check, write tests for mempoolIDs (#3487)
* mempool: add a safety check, write tests for mempoolIDs and document 65536 limit in the mempool reactor spec follow-up to https://github.com/tendermint/tendermint/pull/2778 * rename the test * fixes after Ismail's reviewpull/3500/head
Anton Kaliaev
6 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 140 additions and 159 deletions
Split View
Diff Options
-
+3 -3consensus/state_test.go
-
+7 -1docs/spec/reactors/mempool/reactor.md
-
+4 -1mempool/mempool.go
-
+18 -6mempool/reactor.go
-
+35 -0mempool/reactor_test.go
-
+0 -100p2p/dummy/peer.go
-
+68 -0p2p/mock/peer.go
-
+5 -48p2p/pex/pex_reactor_test.go
+ 3
- 3
consensus/state_test.go
View File
+ 7
- 1
docs/spec/reactors/mempool/reactor.md
View File
+ 4
- 1
mempool/mempool.go
View File
+ 18
- 6
mempool/reactor.go
View File
+ 35
- 0
mempool/reactor_test.go
View File
+ 0
- 100
p2p/dummy/peer.go
View File
| @ -1,100 +0,0 @@ | |||
| package dummy | |||
| import ( | |||
| "net" | |||
| cmn "github.com/tendermint/tendermint/libs/common" | |||
| p2p "github.com/tendermint/tendermint/p2p" | |||
| tmconn "github.com/tendermint/tendermint/p2p/conn" | |||
| ) | |||
| type peer struct { | |||
| cmn.BaseService | |||
| kv map[string]interface{} | |||
| } | |||
| var _ p2p.Peer = (*peer)(nil) | |||
| // NewPeer creates new dummy peer. | |||
| func NewPeer() *peer { | |||
| p := &peer{ | |||
| kv: make(map[string]interface{}), | |||
| } | |||
| p.BaseService = *cmn.NewBaseService(nil, "peer", p) | |||
| return p | |||
| } | |||
| // FlushStop just calls Stop. | |||
| func (p *peer) FlushStop() { | |||
| p.Stop() | |||
| } | |||
| // ID always returns dummy. | |||
| func (p *peer) ID() p2p.ID { | |||
| return p2p.ID("dummy") | |||
| } | |||
| // IsOutbound always returns false. | |||
| func (p *peer) IsOutbound() bool { | |||
| return false | |||
| } | |||
| // IsPersistent always returns false. | |||
| func (p *peer) IsPersistent() bool { | |||
| return false | |||
| } | |||
| // NodeInfo always returns empty node info. | |||
| func (p *peer) NodeInfo() p2p.NodeInfo { | |||
| return p2p.DefaultNodeInfo{} | |||
| } | |||
| // RemoteIP always returns localhost. | |||
| func (p *peer) RemoteIP() net.IP { | |||
| return net.ParseIP("127.0.0.1") | |||
| } | |||
| // Addr always returns tcp://localhost:8800. | |||
| func (p *peer) RemoteAddr() net.Addr { | |||
| return &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 8800} | |||
| } | |||
| // CloseConn always returns nil. | |||
| func (p *peer) CloseConn() error { | |||
| return nil | |||
| } | |||
| // Status always returns empry connection status. | |||
| func (p *peer) Status() tmconn.ConnectionStatus { | |||
| return tmconn.ConnectionStatus{} | |||
| } | |||
| // Send does not do anything and just returns true. | |||
| func (p *peer) Send(byte, []byte) bool { | |||
| return true | |||
| } | |||
| // TrySend does not do anything and just returns true. | |||
| func (p *peer) TrySend(byte, []byte) bool { | |||
| return true | |||
| } | |||
| // Set records value under key specified in the map. | |||
| func (p *peer) Set(key string, value interface{}) { | |||
| p.kv[key] = value | |||
| } | |||
| // Get returns a value associated with the key. Nil is returned if no value | |||
| // found. | |||
| func (p *peer) Get(key string) interface{} { | |||
| if value, ok := p.kv[key]; ok { | |||
| return value | |||
| } | |||
| return nil | |||
| } | |||
| // OriginalAddr always returns nil. | |||
| func (p *peer) OriginalAddr() *p2p.NetAddress { | |||
| return nil | |||
| } | |||
+ 68
- 0
p2p/mock/peer.go
View File
| @ -0,0 +1,68 @@ | |||
| package mock | |||
| import ( | |||
| "net" | |||
| "github.com/tendermint/tendermint/crypto/ed25519" | |||
| cmn "github.com/tendermint/tendermint/libs/common" | |||
| "github.com/tendermint/tendermint/p2p" | |||
| "github.com/tendermint/tendermint/p2p/conn" | |||
| ) | |||
| type Peer struct { | |||
| *cmn.BaseService | |||
| ip net.IP | |||
| id p2p.ID | |||
| addr *p2p.NetAddress | |||
| kv map[string]interface{} | |||
| Outbound, Persistent bool | |||
| } | |||
| // NewPeer creates and starts a new mock peer. If the ip | |||
| // is nil, random routable address is used. | |||
| func NewPeer(ip net.IP) *Peer { | |||
| var netAddr *p2p.NetAddress | |||
| if ip == nil { | |||
| _, netAddr = p2p.CreateRoutableAddr() | |||
| } else { | |||
| netAddr = p2p.NewNetAddressIPPort(ip, 26656) | |||
| } | |||
| nodeKey := p2p.NodeKey{PrivKey: ed25519.GenPrivKey()} | |||
| netAddr.ID = nodeKey.ID() | |||
| mp := &Peer{ | |||
| ip: ip, | |||
| id: nodeKey.ID(), | |||
| addr: netAddr, | |||
| kv: make(map[string]interface{}), | |||
| } | |||
| mp.BaseService = cmn.NewBaseService(nil, "MockPeer", mp) | |||
| mp.Start() | |||
| return mp | |||
| } | |||
| func (mp *Peer) FlushStop() { mp.Stop() } | |||
| func (mp *Peer) TrySend(chID byte, msgBytes []byte) bool { return true } | |||
| func (mp *Peer) Send(chID byte, msgBytes []byte) bool { return true } | |||
| func (mp *Peer) NodeInfo() p2p.NodeInfo { | |||
| return p2p.DefaultNodeInfo{ | |||
| ID_: mp.addr.ID, | |||
| ListenAddr: mp.addr.DialString(), | |||
| } | |||
| } | |||
| func (mp *Peer) Status() conn.ConnectionStatus { return conn.ConnectionStatus{} } | |||
| func (mp *Peer) ID() p2p.ID { return mp.id } | |||
| func (mp *Peer) IsOutbound() bool { return mp.Outbound } | |||
| func (mp *Peer) IsPersistent() bool { return mp.Persistent } | |||
| func (mp *Peer) Get(key string) interface{} { | |||
| if value, ok := mp.kv[key]; ok { | |||
| return value | |||
| } | |||
| return nil | |||
| } | |||
| func (mp *Peer) Set(key string, value interface{}) { | |||
| mp.kv[key] = value | |||
| } | |||
| func (mp *Peer) RemoteIP() net.IP { return mp.ip } | |||
| func (mp *Peer) OriginalAddr() *p2p.NetAddress { return mp.addr } | |||
| func (mp *Peer) RemoteAddr() net.Addr { return &net.TCPAddr{IP: mp.ip, Port: 8800} } | |||
| func (mp *Peer) CloseConn() error { return nil } | |||