Merge pull request #1970 from tendermint/bucky/consensus-stop-wait

consensus: wait on stop if not fastsync
2018-07-14 12:50:15 +01:00 · 2018-07-14 12:50:15 +01:00 · a163f08e4e
parent 5439da6323 9b0b0b02d0
commit a163f08e4e
1 changed files with 3 additions and 0 deletions
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@ -80,6 +80,9 @@ func (conR *ConsensusReactor) OnStop() {
 	conR.BaseReactor.OnStop()
 	conR.unsubscribeFromBroadcastEvents()
 	conR.conS.Stop()
+	if !conR.FastSync() {
+		conR.conS.Wait()
+	}
 }

 // SwitchToConsensus switches from fast_sync mode to consensus mode.