aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-24 01:35:36 +0800
committerobscuren <geffobscura@gmail.com>2014-12-24 01:35:36 +0800
commit780abaec988df302e0c98f1a35e9af35b5623746 (patch)
treedfd26765ec08d3df756730bb186639edb388b4ee /cmd
parent1054c155db8ac59b97b81fa7a7a20f2239eb1e82 (diff)
downloaddexon-780abaec988df302e0c98f1a35e9af35b5623746.tar
dexon-780abaec988df302e0c98f1a35e9af35b5623746.tar.gz
dexon-780abaec988df302e0c98f1a35e9af35b5623746.tar.bz2
dexon-780abaec988df302e0c98f1a35e9af35b5623746.tar.lz
dexon-780abaec988df302e0c98f1a35e9af35b5623746.tar.xz
dexon-780abaec988df302e0c98f1a35e9af35b5623746.tar.zst
dexon-780abaec988df302e0c98f1a35e9af35b5623746.zip
Switched to new trie
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethereum/main.go6
-rw-r--r--cmd/utils/cmd.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 2e0a5663a..e4070aa47 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -21,6 +21,7 @@ import (
"fmt"
"os"
"runtime"
+ "time"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/core/types"
@@ -97,9 +98,6 @@ func main() {
os.Exit(1)
}
- // block.GetRoot() does not exist
- //fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash())
-
// Leave the Println. This needs clean output for piping
fmt.Printf("%s\n", block.State().Dump())
@@ -117,10 +115,12 @@ func main() {
}
if len(ImportChain) > 0 {
+ start := time.Now()
err := utils.ImportChain(ethereum, ImportChain)
if err != nil {
clilogger.Infoln(err)
}
+ clilogger.Infoln("export done in", time.Since(start))
return
}
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index c0a5d1c97..466c51383 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -339,7 +339,7 @@ func BlockDo(ethereum *eth.Ethereum, hash []byte) error {
}
func ImportChain(ethereum *eth.Ethereum, fn string) error {
- clilogger.Infof("importing chain '%s'\n", ImportChain)
+ clilogger.Infof("importing chain '%s'\n", fn)
fh, err := os.OpenFile(fn, os.O_RDONLY, os.ModePerm)
if err != nil {
return err