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

@ -210,16 +210,15 @@ func NewNode(config *cfg.Config,
}
// Make Evidence Reactor
evidenceConfig := &cfg.EvidenceConfig{} // TODO
evidenceDB, err := dbProvider(&DBContext{"evidence", config})
if err != nil {
return nil, err
}
evidenceLogger := logger.With("module", "evidence")
evidenceStore := evidence.NewEvidenceStore(evidenceDB)
evidencePool := evidence.NewEvidencePool(evidenceConfig, evidenceStore, state)
evidencePool := evidence.NewEvidencePool(state.ConsensusParams.EvidenceParams, evidenceStore, state)
evidencePool.SetLogger(evidenceLogger)
evidenceReactor := evidence.NewEvidenceReactor(evidenceConfig, evidencePool)
evidenceReactor := evidence.NewEvidenceReactor(evidencePool)
evidenceReactor.SetLogger(evidenceLogger)
// Make ConsensusReactor