From e3c4625e6352e2cdbd9173790a1779e4523580a9 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Sat, 12 May 2018 16:55:08 -0700
Subject: [PATCH] Suggested changes to consensus/reactor.go

---
 consensus/reactor.go | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/consensus/reactor.go b/consensus/reactor.go
index f50ff379..e98ad6b8 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -696,31 +696,30 @@ func (conR *ConsensusReactor) gossipVotesForHeight(logger log.Logger, rs *cstype
 			return true
 		}
 	}
-
-	if prs.Step <= cstypes.RoundStepCommit && prs.Round != -1 && prs.Round <= rs.Round {
-		// If there are POLPrevotes to send...
-		if prs.ProposalPOLRound != -1 {
-			if polPrevotes := rs.Votes.Prevotes(prs.ProposalPOLRound); polPrevotes != nil {
-				if ps.PickSendVote(polPrevotes) {
-					logger.Debug("Picked rs.Prevotes(prs.ProposalPOLRound) to send",
-						"round", prs.ProposalPOLRound)
-					return true
-				}
-			}
-		}
-
-		// If there are prevotes to send...
+	// If there are prevotes to send...
+	if prs.Step <= cstypes.RoundStepPrevoteWait && prs.Round != -1 && prs.Round <= rs.Round {
 		if ps.PickSendVote(rs.Votes.Prevotes(prs.Round)) {
 			logger.Debug("Picked rs.Prevotes(prs.Round) to send", "round", prs.Round)
 			return true
 		}
-
-		// If there are precommits to send...
+	}
+	// If there are precommits to send...
+	if prs.Step <= cstypes.RoundStepPrecommitWait && prs.Round != -1 && prs.Round <= rs.Round {
 		if ps.PickSendVote(rs.Votes.Precommits(prs.Round)) {
 			logger.Debug("Picked rs.Precommits(prs.Round) to send", "round", prs.Round)
 			return true
 		}
 	}
+	// If there are POLPrevotes to send...
+	if prs.ProposalPOLRound != -1 {
+		if polPrevotes := rs.Votes.Prevotes(prs.ProposalPOLRound); polPrevotes != nil {
+			if ps.PickSendVote(polPrevotes) {
+				logger.Debug("Picked rs.Prevotes(prs.ProposalPOLRound) to send",
+					"round", prs.ProposalPOLRound)
+				return true
+			}
+		}
+	}
 
 	return false
 }