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

reap max bytes from the mempool & check transaction size

Browse Source 
See ADR 020: Limiting txs size inside a block docs/architecture/adr-020-block-size.md

Refs #2035
This commit is contained in:
Anton Kaliaev
2018-08-08 16:03:58 +04:00
parent 7b2f7090fd
commit d73c5cbdb1
33 changed files with 545 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
types/params_test.go
View File

@ -9,9 +9,9 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
)
func newConsensusParams(blockSize, partSize int) ConsensusParams {
func newConsensusParams(txsBytes, partSize int) ConsensusParams {
return ConsensusParams{
BlockSize: BlockSize{MaxBytes: blockSize},
BlockSize: BlockSize{MaxBytes: txsBytes},
BlockGossip: BlockGossip{BlockPartSizeBytes: partSize},
}
}
@ -33,22 +33,19 @@ func TestConsensusParamsValidation(t *testing.T) {
{newConsensusParams(101*1024*1024, 400), false},
{newConsensusParams(1024*1024*1024, 400), false},
}
for _, testCase := range testCases {
if testCase.valid {
assert.NoError(t, testCase.params.Validate(), "expected no error for valid params")
for _, tc := range testCases {
if tc.valid {
assert.NoError(t, tc.params.Validate(), "expected no error for valid params")
} else {
assert.Error(t, testCase.params.Validate(), "expected error for non valid params")
assert.Error(t, tc.params.Validate(), "expected error for non valid params")
}
}
}
func makeParams(blockBytes, blockTx, blockGas, txBytes,
txGas, partSize int) ConsensusParams {
func makeParams(txsBytes, blockGas, txBytes, txGas, partSize int) ConsensusParams {
return ConsensusParams{
BlockSize: BlockSize{
MaxBytes: blockBytes,
MaxTxs: blockTx,
MaxBytes: txsBytes,
MaxGas: int64(blockGas),
},
TxSize: TxSize{
@ -63,14 +60,11 @@ func makeParams(blockBytes, blockTx, blockGas, txBytes,
func TestConsensusParamsHash(t *testing.T) {
params := []ConsensusParams{
makeParams(1, 2, 3, 4, 5, 6),
makeParams(7, 2, 3, 4, 5, 6),
makeParams(1, 7, 3, 4, 5, 6),
makeParams(1, 2, 7, 4, 5, 6),
makeParams(1, 2, 3, 7, 5, 6),
makeParams(1, 2, 3, 4, 7, 6),
makeParams(1, 2, 3, 4, 5, 7),
makeParams(6, 5, 4, 3, 2, 1),
makeParams(6, 2, 3, 4, 5),
makeParams(1, 6, 3, 4, 5),
makeParams(1, 2, 6, 4, 5),
makeParams(1, 2, 3, 6, 5),
makeParams(1, 2, 3, 4, 6),
}
hashes := make([][]byte, len(params))
@ -96,18 +90,17 @@ func TestConsensusParamsUpdate(t *testing.T) {
}{
// empty updates
{
makeParams(1, 2, 3, 4, 5, 6),
makeParams(1, 2, 3, 4, 5),
&abci.ConsensusParams{},
makeParams(1, 2, 3, 4, 5, 6),
makeParams(1, 2, 3, 4, 5),
},
// negative BlockPartSizeBytes
{
makeParams(1, 2, 3, 4, 5, 6),
makeParams(1, 2, 3, 4, 5),
&abci.ConsensusParams{
BlockSize: &abci.BlockSize{
MaxBytes: -100,
MaxTxs: -200,
MaxGas: -300,
MaxGas: -200,
},
TxSize: &abci.TxSize{
MaxBytes: -400,
@ -117,26 +110,25 @@ func TestConsensusParamsUpdate(t *testing.T) {
BlockPartSizeBytes: -600,
},
},
makeParams(1, 2, 3, 4, 5, 6),
makeParams(1, 2, 3, 4, 5),
},
// fine updates
{
makeParams(1, 2, 3, 4, 5, 6),
makeParams(1, 2, 3, 4, 5),
&abci.ConsensusParams{
BlockSize: &abci.BlockSize{
MaxBytes: 100,
MaxTxs: 200,
MaxGas: 300,
MaxGas: 200,
},
TxSize: &abci.TxSize{
MaxBytes: 400,
MaxGas: 500,
MaxBytes: 300,
MaxGas: 400,
},
BlockGossip: &abci.BlockGossip{
BlockPartSizeBytes: 600,
BlockPartSizeBytes: 500,
},
},
makeParams(100, 200, 300, 400, 500, 600),
makeParams(100, 200, 300, 400, 500),
},
}
for _, tc := range testCases {