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

Merge remote-tracking branch 'origin/consensus_refactor' into consensus_refactor_jae

Browse Source
This commit is contained in:
Jae Kwon
2015-12-14 09:33:11 -08:00
parent 855cb0f906 b9e143d956
commit c95b89e98c
12 changed files with 650 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
types/block.go
View File

@ -62,8 +62,12 @@ func (b *Block) ValidateBasic(chainID string, lastBlockHeight int, lastBlockHash
}
func (b *Block) FillHeader() {
b.LastValidationHash = b.LastValidation.Hash()
b.DataHash = b.Data.Hash()
if b.LastValidationHash == nil {
b.LastValidationHash = b.LastValidation.Hash()
}
if b.DataHash == nil {
b.DataHash = b.Data.Hash()
}
}
// Computes and returns the block hash.