From ff87958f95f4ad4bc4a1caed0eb226bcb44191db Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 4 May 2015 19:08:07 -0400 Subject: [PATCH] broadcast on newStepCh on switch to consensus reactor --- blockchain/reactor.go | 2 +- consensus/reactor.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blockchain/reactor.go b/blockchain/reactor.go index 971c72a3..bc5bb38f 100644 --- a/blockchain/reactor.go +++ b/blockchain/reactor.go @@ -203,7 +203,7 @@ FOR_LOOP: maxPending := bcR.pool.numPending == maxPendingRequests maxPeerless := bcR.pool.peerless == bcR.pool.numPending o, i, _ := bcR.sw.NumPeers() - enoughPeers := o+i > 5 + enoughPeers := o+i >= 5 if maxPending && maxPeerless && enoughPeers { log.Warn("Time to switch to consensus reactor!", "height", bcR.pool.height) bcR.pool.Stop() diff --git a/consensus/reactor.go b/consensus/reactor.go index fd888728..3926bfd5 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -245,6 +245,7 @@ func (conR *ConsensusReactor) SetPrivValidator(priv *sm.PrivValidator) { // Reset to some state. func (conR *ConsensusReactor) ResetToState(state *sm.State) { conR.conS.updateToState(state, false) + conR.conS.newStepCh <- conR.conS.getRoundState() } // implements events.Eventable