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

Merge pull request #3154 from tendermint/master

Browse Source 
Merge master back to develop
This commit is contained in:
Ethan Buchman
2019-01-18 12:39:21 -05:00
committed by GitHub
parent f5f1416a14 07263298bd
commit d17969e378
17 changed files with 266 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
types/block.go
View File

@ -323,16 +323,17 @@ func MaxDataBytes(maxBytes int64, valsCount, evidenceCount int) int64 {
}
// MaxDataBytesUnknownEvidence returns the maximum size of block's data when
// evidence count is unknown. MaxEvidenceBytesPerBlock will be used as the size
// evidence count is unknown. MaxEvidencePerBlock will be used for the size
// of evidence.
//
// XXX: Panics on negative result.
func MaxDataBytesUnknownEvidence(maxBytes int64, valsCount int) int64 {
_, maxEvidenceBytes := MaxEvidencePerBlock(maxBytes)
maxDataBytes := maxBytes -
MaxAminoOverheadForBlock -
MaxHeaderBytes -
int64(valsCount)*MaxVoteBytes -
MaxEvidenceBytesPerBlock(maxBytes)
maxEvidenceBytes
if maxDataBytes < 0 {
panic(fmt.Sprintf(