From a23478c0be94e1e727a64d20341b8d6f98d7f0a0 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Thu, 6 Aug 2015 19:57:39 +0200
Subject: core, eth, trie, xeth: merged state, chain, extra databases in one

---
 cmd/geth/chaincmd.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'cmd/geth')

diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index 2d8eb15c2..876b8c6ba 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -74,10 +74,10 @@ func importChain(ctx *cli.Context) {
 	if len(ctx.Args()) != 1 {
 		utils.Fatalf("This command requires an argument.")
 	}
-	chain, blockDB, stateDB, extraDB := utils.MakeChain(ctx)
+	chain, chainDb := utils.MakeChain(ctx)
 	start := time.Now()
 	err := utils.ImportChain(chain, ctx.Args().First())
-	closeAll(blockDB, stateDB, extraDB)
+	chainDb.Close()
 	if err != nil {
 		utils.Fatalf("Import error: %v", err)
 	}
@@ -88,7 +88,7 @@ func exportChain(ctx *cli.Context) {
 	if len(ctx.Args()) < 1 {
 		utils.Fatalf("This command requires an argument.")
 	}
-	chain, _, _, _ := utils.MakeChain(ctx)
+	chain, _ := utils.MakeChain(ctx)
 	start := time.Now()
 
 	var err error
@@ -136,8 +136,8 @@ func removeDB(ctx *cli.Context) {
 func upgradeDB(ctx *cli.Context) {
 	glog.Infoln("Upgrading blockchain database")
 
-	chain, blockDB, stateDB, extraDB := utils.MakeChain(ctx)
-	v, _ := blockDB.Get([]byte("BlockchainVersion"))
+	chain, chainDb := utils.MakeChain(ctx)
+	v, _ := chainDb.Get([]byte("BlockchainVersion"))
 	bcVersion := int(common.NewValue(v).Uint())
 	if bcVersion == 0 {
 		bcVersion = core.BlockChainVersion
@@ -149,15 +149,14 @@ func upgradeDB(ctx *cli.Context) {
 	if err := utils.ExportChain(chain, exportFile); err != nil {
 		utils.Fatalf("Unable to export chain for reimport %s", err)
 	}
-	closeAll(blockDB, stateDB, extraDB)
-	os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "blockchain"))
-	os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "state"))
+	chainDb.Close()
+	os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "chaindata"))
 
 	// Import the chain file.
-	chain, blockDB, stateDB, extraDB = utils.MakeChain(ctx)
-	blockDB.Put([]byte("BlockchainVersion"), common.NewValue(core.BlockChainVersion).Bytes())
+	chain, chainDb = utils.MakeChain(ctx)
+	chainDb.Put([]byte("BlockchainVersion"), common.NewValue(core.BlockChainVersion).Bytes())
 	err := utils.ImportChain(chain, exportFile)
-	closeAll(blockDB, stateDB, extraDB)
+	chainDb.Close()
 	if err != nil {
 		utils.Fatalf("Import error %v (a backup is made in %s, use the import command to import it)", err, exportFile)
 	} else {
@@ -167,7 +166,7 @@ func upgradeDB(ctx *cli.Context) {
 }
 
 func dump(ctx *cli.Context) {
-	chain, _, stateDB, _ := utils.MakeChain(ctx)
+	chain, chainDb := utils.MakeChain(ctx)
 	for _, arg := range ctx.Args() {
 		var block *types.Block
 		if hashish(arg) {
@@ -180,10 +179,11 @@ func dump(ctx *cli.Context) {
 			fmt.Println("{}")
 			utils.Fatalf("block not found")
 		} else {
-			state := state.New(block.Root(), stateDB)
+			state := state.New(block.Root(), chainDb)
 			fmt.Printf("%s\n", state.Dump())
 		}
 	}
+	chainDb.Close()
 }
 
 // hashish returns true for strings that look like hashes.
-- 
cgit v1.2.3