fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-12 04:41:22 +00:00
Code Issues Projects Releases Wiki Activity

drop mempool_reap. use block_size=-1 instead

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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]
}