From e90c47c6fa0ed38dc11f10df857e1755cf7e0e66 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Sun, 5 Jul 2015 19:05:07 -0700
Subject: [PATCH] Add rebroadcastRoundStepMessage

---
 consensus/reactor.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/consensus/reactor.go b/consensus/reactor.go
index 0c827d81e..c5f0014be 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -26,7 +26,8 @@ const (
 
 	PeerStateKey = "ConsensusReactor.peerState"
 
-	peerGossipSleepDuration = 100 * time.Millisecond // Time to sleep if there's nothing to send.
+	peerGossipSleepDuration      = 100 * time.Millisecond  // Time to sleep if there's nothing to send.
+	rebroadcastRoundStepDuration = 1000 * time.Millisecond // Time to sleep if there's nothing to send.
 )
 
 //-----------------------------------------------------------------------------
@@ -66,6 +67,7 @@ func (conR *ConsensusReactor) Start(sw *p2p.Switch) {
 			conR.conS.Start()
 		}
 		go conR.broadcastNewRoundStepRoutine()
+		go conR.rebroadcastRoundStepRoutine()
 	}
 }
 
@@ -319,6 +321,24 @@ func (conR *ConsensusReactor) broadcastNewRoundStepRoutine() {
 	}
 }
 
+// Periodically broadcast NewRoundStepMessage.
+// This is a hack. TODO remove the need for it?
+// The issue is with Start() happening after a NewRoundStep message
+// was received from a peer, for the bootstrapping set.
+func (conR *ConsensusReactor) rebroadcastRoundStepRoutine() {
+	for {
+		time.Sleep(rebroadcastRoundStepDuration)
+		rs := conR.conS.GetRoundState()
+		nrsMsg, csMsg := makeRoundStepMessages(rs)
+		if nrsMsg != nil {
+			conR.sw.Broadcast(StateChannel, nrsMsg)
+		}
+		if csMsg != nil {
+			conR.sw.Broadcast(StateChannel, csMsg)
+		}
+	}
+}
+
 func (conR *ConsensusReactor) sendNewRoundStepMessage(peer *p2p.Peer) {
 	rs := conR.conS.GetRoundState()
 	nrsMsg, csMsg := makeRoundStepMessages(rs)
@@ -809,6 +829,12 @@ func (ps *PeerState) ApplyNewRoundStepMessage(msg *NewRoundStepMessage, rs *Roun
 	ps.mtx.Lock()
 	defer ps.mtx.Unlock()
 
+	// Ignore duplicate messages.
+	// TODO: This is only necessary because rebroadcastRoundStepRoutine.
+	if ps.Height == msg.Height && ps.Round == msg.Round && ps.Step == msg.Step {
+		return
+	}
+
 	// Just remember these values.
 	psHeight := ps.Height
 	psRound := ps.Round