aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-19 02:13:53 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-19 02:13:53 +0800
commitbd0c0a633bebe8893c4b06a50740047e4376107c (patch)
tree0b0632fa78f80206eb1fd96dd2b3d3e6b43ac1aa /cmd
parentd6adadc5e37f3d01cac25b5371e1c42b7036735a (diff)
parent40717465bc8c0e2feb0f1e48ddc721c7292ba992 (diff)
downloaddexon-bd0c0a633bebe8893c4b06a50740047e4376107c.tar
dexon-bd0c0a633bebe8893c4b06a50740047e4376107c.tar.gz
dexon-bd0c0a633bebe8893c4b06a50740047e4376107c.tar.bz2
dexon-bd0c0a633bebe8893c4b06a50740047e4376107c.tar.lz
dexon-bd0c0a633bebe8893c4b06a50740047e4376107c.tar.xz
dexon-bd0c0a633bebe8893c4b06a50740047e4376107c.tar.zst
dexon-bd0c0a633bebe8893c4b06a50740047e4376107c.zip
Merge pull request #1022 from obscuren/parallel_nonce_checks
Parallelise nonce checks
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/js_test.go2
-rw-r--r--cmd/utils/flags.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index e02e8f704..6368efbfc 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -172,6 +172,8 @@ func TestBlockChain(t *testing.T) {
tmpfile := filepath.Join(extmp, "export.chain")
tmpfileq := strconv.Quote(tmpfile)
+ ethereum.ChainManager().Reset()
+
checkEvalJSON(t, repl, `admin.export(`+tmpfileq+`)`, `true`)
if _, err := os.Stat(tmpfile); err != nil {
t.Fatal(err)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 6ec4fdc55..f646e4fcc 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -336,8 +336,8 @@ func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Dat
}
eventMux := new(event.TypeMux)
- chainManager := core.NewChainManager(blockDb, stateDb, eventMux)
pow := ethash.New()
+ chainManager := core.NewChainManager(blockDb, stateDb, pow, eventMux)
txPool := core.NewTxPool(eventMux, chainManager.State, chainManager.GasLimit)
blockProcessor := core.NewBlockProcessor(stateDb, extraDb, pow, txPool, chainManager, eventMux)
chainManager.SetProcessor(blockProcessor)