consensus: Wait for proposal or timeout before prevote (#2540)

* Fix termination issues and improve tests

* Improve formatting and tests based on reviewer feedback
This commit is contained in:
Zarko Milosevic
2018-10-12 22:13:01 +02:00
committed by Ethan Buchman
parent e1538bf67e
commit 2363d88979
10 changed files with 516 additions and 367 deletions

View File

@ -106,7 +106,7 @@ func DefaultMetricsProvider(config *cfg.InstrumentationConfig) MetricsProvider {
return func() (*cs.Metrics, *p2p.Metrics, *mempl.Metrics, *sm.Metrics) {
if config.Prometheus {
return cs.PrometheusMetrics(config.Namespace), p2p.PrometheusMetrics(config.Namespace),
mempl.PrometheusMetrics(config.Namespace), sm.PrometheusMetrics(config.Namespace)
mempl.PrometheusMetrics(config.Namespace), sm.PrometheusMetrics(config.Namespace)
}
return cs.NopMetrics(), p2p.NopMetrics(), mempl.NopMetrics(), sm.NopMetrics()
}