Merge pull request tendermint#18 from BiJie/nostate

[R4R]validator do not verify hash when with no state
rickyyangz · Dec 17, 2018 · 3f17d89 · 3f17d89
2 parents 93d3b62 + ddeee6c
commit 3f17d89
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/state/validation.go b/state/validation.go
@@ -74,14 +74,14 @@ func validateBlock(stateDB dbm.DB, state State, block *types.Block, withAppStat
 			block.LastResultsHash,
 		)
 	}
-	if !bytes.Equal(block.ValidatorsHash, state.Validators.Hash()) {
+	if withAppStat && !bytes.Equal(block.ValidatorsHash, state.Validators.Hash()) {
 		return fmt.Errorf(
 			"Wrong Block.Header.ValidatorsHash.  Expected %X, got %v",
 			state.Validators.Hash(),
 			block.ValidatorsHash,
 		)
 	}
-	if !bytes.Equal(block.NextValidatorsHash, state.NextValidators.Hash()) {
+	if withAppStat && !bytes.Equal(block.NextValidatorsHash, state.NextValidators.Hash()) {
 		return fmt.Errorf("Wrong Block.Header.NextValidatorsHash.  Expected %X, got %v", state.NextValidators.Hash(), block.NextValidatorsHash)
 	}