fixes from rebase

This commit is contained in:
Ethan Buchman
2017-12-26 20:34:57 -05:00
parent b01b1e4758
commit 6a4fd46479
16 changed files with 51 additions and 57 deletions

View File

@@ -66,7 +66,8 @@ func WALWithNBlocks(numBlocks int) (data []byte, err error) {
}
defer eventBus.Stop()
mempool := types.MockMempool{}
consensusState := NewConsensusState(config.Consensus, state.Copy(), proxyApp.Consensus(), blockStore, mempool)
evpool := types.MockEvidencePool{}
consensusState := NewConsensusState(config.Consensus, state.Copy(), proxyApp.Consensus(), blockStore, mempool, evpool)
consensusState.SetLogger(logger)
consensusState.SetEventBus(eventBus)
if privValidator != nil {