aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-15 22:47:44 +0800
committerobscuren <geffobscura@gmail.com>2015-05-16 02:26:15 +0800
commit55d85d60fdad2cbd7947d87b2a81bd8df6a18025 (patch)
treed855d927424171b258f14598d451c982d9c25736
parentd3e84cc8b4d995b4cec505b1b183b44d55f61453 (diff)
downloadgo-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.tar
go-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.tar.gz
go-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.tar.bz2
go-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.tar.lz
go-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.tar.xz
go-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.tar.zst
go-tangerine-55d85d60fdad2cbd7947d87b2a81bd8df6a18025.zip
eth, cmd/geth: start mining from console respects CLI flag
-rw-r--r--cmd/geth/admin.go2
-rw-r--r--eth/backend.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index 91a336cbb..ebdf3512a 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -288,7 +288,7 @@ func (js *jsre) startMining(call otto.FunctionCall) otto.Value {
return otto.FalseValue()
}
} else {
- threads = 4
+ threads = int64(js.ethereum.MinerThreads)
}
err = js.ethereum.StartMining(int(threads))
diff --git a/eth/backend.go b/eth/backend.go
index 064018955..a7107f8d8 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -190,6 +190,7 @@ type Ethereum struct {
// logger logger.LogSystem
Mining bool
+ MinerThreads int
NatSpec bool
DataDir string
etherbase common.Address
@@ -262,6 +263,7 @@ func New(config *Config) (*Ethereum, error) {
ethVersionId: config.ProtocolVersion,
netVersionId: config.NetworkId,
NatSpec: config.NatSpec,
+ MinerThreads: config.MinerThreads,
}
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())