aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorBas van Kervel <bas@ethdev.com>2016-04-07 17:25:28 +0800
committerBas van Kervel <bas@ethdev.com>2016-04-07 18:49:00 +0800
commit4081868452ba5cdb92ae5d2cee8d055f20fcf4aa (patch)
treeb93fb8558583fd0dc2a03630bbff5ecb6ed6f67b /cmd
parent7e02105672cda92889a78db864a5701d78f45eb2 (diff)
downloaddexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.tar
dexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.tar.gz
dexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.tar.bz2
dexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.tar.lz
dexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.tar.xz
dexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.tar.zst
dexon-4081868452ba5cdb92ae5d2cee8d055f20fcf4aa.zip
cmd/utils: bugfix where database is opened multiple times
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go18
1 files changed, 11 insertions, 7 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 2f10938e3..a2927108f 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -776,16 +776,20 @@ func SetupNetwork(ctx *cli.Context) {
params.TargetGasLimit = common.String2Big(ctx.GlobalString(TargetGasLimitFlag.Name))
}
-// MustMakeChainConfig reads the chain configuration from the given database.
+// MustMakeChainConfig reads the chain configuration from the database in ctx.Datadir.
func MustMakeChainConfig(ctx *cli.Context) *core.ChainConfig {
- var (
- db = MakeChainDatabase(ctx)
- genesis = core.GetBlock(db, core.GetCanonicalHash(db, 0))
- )
+ db := MakeChainDatabase(ctx)
defer db.Close()
+ return MustMakeChainConfigFromDb(ctx, db)
+}
+
+// MustMakeChainConfigFromDb reads the chain configuration from the given database.
+func MustMakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainConfig {
+ genesis := core.GetBlock(db, core.GetCanonicalHash(db, 0))
+
if genesis != nil {
- // Exsting genesis block, use stored config if available.
+ // Existing genesis block, use stored config if available.
storedConfig, err := core.GetChainConfig(db, genesis.Hash())
if err == nil {
return storedConfig
@@ -829,7 +833,7 @@ func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database
}
}
- chainConfig := MustMakeChainConfig(ctx)
+ chainConfig := MustMakeChainConfigFromDb(ctx, chainDb)
var eventMux event.TypeMux
chain, err = core.NewBlockChain(chainDb, chainConfig, ethash.New(), &eventMux)