certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drop mempool_reap. use block_size=-1 instead

This commit is contained in:
Ethan Buchman 2016-03-04 22:17:55 +00:00
parent 085b3bc1f2
commit 94f3d201e1
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/tendermint/config.go
View File

@ -79,7 +79,6 @@ func GetConfig(rootDir string) cfg.Config {
mapConfig.SetDefault("timeout_commit", 1000)
mapConfig.SetDefault("mempool_recheck", true)
mapConfig.SetDefault("mempool_broadcast", true)
mapConfig.SetDefault("mempool_reap", true)
return mapConfig
}

1
config/tendermint_test/config.go
View File

@ -103,7 +103,6 @@ func GetConfig(rootDir string) cfg.Config {
mapConfig.SetDefault("timeout_commit", 1)
mapConfig.SetDefault("mempool_recheck", true)
mapConfig.SetDefault("mempool_broadcast", true)
mapConfig.SetDefault("mempool_reap", true)
return mapConfig
}

9
consensus/state.go
View File

@ -877,11 +877,16 @@ func (cs *ConsensusState) createProposalBlock() (block *types.Block, blockParts
return
}
maxBlockSize := config.GetInt("block_size")
// Mempool validated transactions
txs := cs.mempool.Reap()
// if block_size < 0, no txs will be included
var txs []types.Tx
if maxBlockSize >= 0 {
txs = cs.mempool.Reap()
}
// Cap the number of txs in a block
maxBlockSize := config.GetInt("block_size")
if maxBlockSize > 0 && maxBlockSize < len(txs) {
txs = txs[:maxBlockSize]
}

4
mempool/mempool.go
View File

@ -184,10 +184,6 @@ func (mem *Mempool) resCbRecheck(req *tmsp.Request, res *tmsp.Response) {
// Get the valid transactions remaining
func (mem *Mempool) Reap() []types.Tx {
if !config.GetBool("mempool_reap") {
return []types.Tx{}
}
mem.proxyMtx.Lock()
defer mem.proxyMtx.Unlock()