From 7bf12a47295871c8122dcd7e1854641a10b00e78 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Wed, 23 Nov 2022 14:47:47 -0500 Subject: [PATCH] comment out new height last commit send again --- consensus/reactor.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/consensus/reactor.go b/consensus/reactor.go index 769ed8471..58a202426 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -806,24 +806,24 @@ func (conR *Reactor) gossipVotesForHeight( // If there are lastCommits to send... - if prs.Step == cstypes.RoundStepNewHeight && prs.Height == rs.Height { - if ps.PickSendVote(rs.LastCommit) { - logger.Debug("Picked rs.LastCommit to send") - return true - } - } - /* - // If there are POL prevotes to send... - if prs.Step <= cstypes.RoundStepPropose && prs.Round != -1 && prs.Round <= rs.Round && 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 prs.Step == cstypes.RoundStepNewHeight && prs.Height == rs.Height { + if ps.PickSendVote(rs.LastCommit) { + logger.Debug("Picked rs.LastCommit to send") + return true } } + + // If there are POL prevotes to send... + if prs.Step <= cstypes.RoundStepPropose && prs.Round != -1 && prs.Round <= rs.Round && 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 prs.Step <= cstypes.RoundStepPrevoteWait && prs.Round != -1 && prs.Round <= rs.Round {