From 01ac378c962122a336e4e9a2e12f8ed87d9281bd Mon Sep 17 00:00:00 2001 From: Zarko Milosevic Date: Wed, 25 Apr 2018 16:12:25 +0200 Subject: [PATCH] Update condition based on Jae input --- consensus/state.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/consensus/state.go b/consensus/state.go index b8d741fb3..8b66ddfb9 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -1322,7 +1322,7 @@ func (cs *ConsensusState) addProposalBlockPart(height int64, part *types.Part, v blockID, ok := prevotes.TwoThirdsMajority() if ok && !blockID.IsZero() && (cs.ValidRound < cs.Round) { // update valid value - if !cs.ValidBlock.HashesTo(blockID.Hash) && cs.ProposalBlock.HashesTo(blockID.Hash) { + if cs.ProposalBlock.HashesTo(blockID.Hash) { cs.ValidRound = cs.Round cs.ValidBlock = cs.ProposalBlock cs.ValidBlockParts = cs.ProposalBlockParts @@ -1440,7 +1440,7 @@ func (cs *ConsensusState) addVote(vote *types.Vote, peerID p2p.ID) (added bool, // Update ValidBlock if ok && !blockID.IsZero() && (cs.ValidRound < vote.Round) && (vote.Round <= cs.Round) { // update valid value - if !cs.ValidBlock.HashesTo(blockID.Hash) && cs.ProposalBlock.HashesTo(blockID.Hash) { + if cs.ProposalBlock.HashesTo(blockID.Hash) { cs.ValidRound = vote.Round cs.ValidBlock = cs.ProposalBlock cs.ValidBlockParts = cs.ProposalBlockParts