Merge branch 'enhance_some_comment' of https://github.com/CoreyLin/go-ethereum into enhance_some_comment

This commit is contained in:
Lin Corey 2018-11-08 09:54:44 +08:00
commit 5d4baf2289

View file

@ -176,8 +176,9 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig
} }
} }
// Get the existing chain configuration. // Get the new chain configuration for genesis block.
newcfg := genesis.configOrDefault(stored) newcfg := genesis.configOrDefault(stored)
// Get the existing chain configuration for genesis block.
storedcfg := rawdb.ReadChainConfig(db, stored) storedcfg := rawdb.ReadChainConfig(db, stored)
if storedcfg == nil { if storedcfg == nil {
log.Warn("Found genesis block without chain config") log.Warn("Found genesis block without chain config")