broadcast on newStepCh on switch to consensus reactor

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()

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