From edd7263f063556fc631b85ba9693648e0d8f68da Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 5 May 2017 12:25:10 -0400 Subject: [PATCH] fixes from review --- cmd/tendermint/commands/root.go | 3 +-- node/node.go | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cmd/tendermint/commands/root.go b/cmd/tendermint/commands/root.go index fd369d934..7ea5eacfb 100644 --- a/cmd/tendermint/commands/root.go +++ b/cmd/tendermint/commands/root.go @@ -9,12 +9,11 @@ import ( ) var ( - config *cfg.Config + config = cfg.DefaultConfig() log = logger.New("module", "main") ) func init() { - config = cfg.DefaultConfig() RootCmd.PersistentFlags().String("log_level", config.LogLevel, "Log level") } diff --git a/node/node.go b/node/node.go index 6896bc4f1..04a6f3cdf 100644 --- a/node/node.go +++ b/node/node.go @@ -74,11 +74,6 @@ func NewNode(config *cfg.Config, privValidator *types.PrivValidator, clientCreat stateDB := dbm.NewDB("state", config.DBBackend, config.DBDir()) state := sm.GetState(stateDB, config.GenesisFile()) - // add the chainid and number of validators to the global config - // TODO: Set ChainID. eg: - // config.Consensus.SetChainID(state.ChainID) // ... - // but actually consensus doesnt need it since the cs has the state ... - // Create the proxyApp, which manages connections (consensus, mempool, query) // and sync tendermint and the app by replaying any necessary blocks proxyApp := proxy.NewAppConns(clientCreator, consensus.NewHandshaker(state, blockStore))