aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils/flags.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-08-09 20:16:37 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-08-09 20:16:37 +0800
commit2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a (patch)
treee3e7d013e2ccae939df7dd1d8aa7dcb3802fadd7 /cmd/utils/flags.go
parent07cb8092e7a41e80224dc63691146e8714f94ebf (diff)
parenta23478c0be94e1e727a64d20341b8d6f98d7f0a0 (diff)
downloaddexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.tar
dexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.tar.gz
dexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.tar.bz2
dexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.tar.lz
dexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.tar.xz
dexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.tar.zst
dexon-2fcf7f1241648dc2c0ed90a122c5945f25b3ce1a.zip
Merge pull request #1604 from obscuren/db-merge
core, eth, trie, xeth: merged state, chain, extra databases in one
Diffstat (limited to 'cmd/utils/flags.go')
-rw-r--r--cmd/utils/flags.go18
1 files changed, 6 insertions, 12 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index e7b30cfa0..462da9305 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -458,23 +458,17 @@ func SetupVM(ctx *cli.Context) {
}
// MakeChain creates a chain manager from set command line flags.
-func MakeChain(ctx *cli.Context) (chain *core.ChainManager, blockDB, stateDB, extraDB common.Database) {
+func MakeChain(ctx *cli.Context) (chain *core.ChainManager, chainDb common.Database) {
datadir := ctx.GlobalString(DataDirFlag.Name)
cache := ctx.GlobalInt(CacheFlag.Name)
var err error
- if blockDB, err = ethdb.NewLDBDatabase(filepath.Join(datadir, "blockchain"), cache); err != nil {
- Fatalf("Could not open database: %v", err)
- }
- if stateDB, err = ethdb.NewLDBDatabase(filepath.Join(datadir, "state"), cache); err != nil {
- Fatalf("Could not open database: %v", err)
- }
- if extraDB, err = ethdb.NewLDBDatabase(filepath.Join(datadir, "extra"), cache); err != nil {
+ if chainDb, err = ethdb.NewLDBDatabase(filepath.Join(datadir, "chaindata"), cache); err != nil {
Fatalf("Could not open database: %v", err)
}
if ctx.GlobalBool(OlympicFlag.Name) {
InitOlympic()
- _, err := core.WriteTestNetGenesisBlock(stateDB, blockDB, 42)
+ _, err := core.WriteTestNetGenesisBlock(chainDb, 42)
if err != nil {
glog.Fatalln(err)
}
@@ -483,14 +477,14 @@ func MakeChain(ctx *cli.Context) (chain *core.ChainManager, blockDB, stateDB, ex
eventMux := new(event.TypeMux)
pow := ethash.New()
//genesis := core.GenesisBlock(uint64(ctx.GlobalInt(GenesisNonceFlag.Name)), blockDB)
- chain, err = core.NewChainManager(blockDB, stateDB, extraDB, pow, eventMux)
+ chain, err = core.NewChainManager(chainDb, pow, eventMux)
if err != nil {
Fatalf("Could not start chainmanager: %v", err)
}
- proc := core.NewBlockProcessor(stateDB, extraDB, pow, chain, eventMux)
+ proc := core.NewBlockProcessor(chainDb, pow, chain, eventMux)
chain.SetProcessor(proc)
- return chain, blockDB, stateDB, extraDB
+ return chain, chainDb
}
// MakeChain creates an account manager from set command line flags.