Merge remote-tracking branch 'origin/develop' into consensus_refactor

This commit is contained in:
Jae Kwon
2015-12-12 19:34:39 -08:00
27 changed files with 1957 additions and 95 deletions

View File

@ -285,7 +285,7 @@ func simpleConsensusState(nValidators int) (*ConsensusState, []*validatorStub) {
blockStore := bc.NewBlockStore(blockDB)
// one for mempool, one for consensus
app := example.NewCounterApplication()
app := example.NewCounterApplication(false)
appCMem := app.Open()
appCCon := app.Open()
proxyAppCtxMem := proxy.NewLocalAppContext(appCMem)