From 51eed7964ec35bbdc23dd8a4a8fffedad247e33d Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sun, 8 Mar 2015 22:44:48 +0700
Subject: add export blockchain subcommand, remove BlockDo

---
 cmd/utils/cmd.go | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

(limited to 'cmd/utils')

diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 99e60ff9e..8e516748e 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -35,7 +35,6 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/rlp"
 	rpchttp "github.com/ethereum/go-ethereum/rpc/http"
-	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
 )
 
@@ -188,27 +187,8 @@ func FormatTransactionData(data string) []byte {
 	return d
 }
 
-// Replay block
-func BlockDo(ethereum *eth.Ethereum, hash []byte) error {
-	block := ethereum.ChainManager().GetBlock(hash)
-	if block == nil {
-		return fmt.Errorf("unknown block %x", hash)
-	}
-
-	parent := ethereum.ChainManager().GetBlock(block.ParentHash())
-
-	statedb := state.New(parent.Root(), ethereum.StateDb())
-	_, err := ethereum.BlockProcessor().TransitionState(statedb, parent, block, true)
-	if err != nil {
-		return err
-	}
-
-	return nil
-
-}
-
-func ImportChain(chain *core.ChainManager, fn string) error {
-	fmt.Printf("importing chain '%s'\n", fn)
+func ImportChain(chainmgr *core.ChainManager, fn string) error {
+	fmt.Printf("importing blockchain '%s'\n", fn)
 	fh, err := os.OpenFile(fn, os.O_RDONLY, os.ModePerm)
 	if err != nil {
 		return err
@@ -220,11 +200,24 @@ func ImportChain(chain *core.ChainManager, fn string) error {
 		return err
 	}
 
-	chain.Reset()
-	if err := chain.InsertChain(blocks); err != nil {
+	chainmgr.Reset()
+	if err := chainmgr.InsertChain(blocks); err != nil {
 		return err
 	}
 	fmt.Printf("imported %d blocks\n", len(blocks))
 
 	return nil
 }
+
+func ExportChain(chainmgr *core.ChainManager, fn string) error {
+	fmt.Printf("exporting blockchain '%s'\n", fn)
+
+	data := chainmgr.Export()
+
+	if err := ethutil.WriteFile(fn, data); err != nil {
+		return err
+	}
+	fmt.Printf("exported blockchain\n")
+
+	return nil
+}
-- 
cgit v1.2.3


From 27c42ea93488790d1c509c3ee6f187a1edab7e0a Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Fri, 6 Mar 2015 03:25:57 +0100
Subject: Add empty total difficulty to test blocks and clean up stopping the
 node

---
 cmd/utils/cmd.go | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'cmd/utils')

diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index a77c6ad4d..3823ec75a 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -134,6 +134,15 @@ func StartEthereum(ethereum *eth.Ethereum) {
 	})
 }
 
+func StartEthereumForTest(ethereum *eth.Ethereum) {
+	clilogger.Infoln("Starting ", ethereum.Name())
+	ethereum.StartForTest()
+	RegisterInterrupt(func(sig os.Signal) {
+		ethereum.Stop()
+		logger.Flush()
+	})
+}
+
 func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) {
 	var err error
 	switch {
-- 
cgit v1.2.3