eth, cmd/geth: start mining from console respects CLI flag

This commit is contained in:
obscuren 2015-05-15 16:47:44 +02:00
parent d3e84cc8b4
commit 55d85d60fd
2 changed files with 3 additions and 1 deletions

View File

@ -288,7 +288,7 @@ func (js *jsre) startMining(call otto.FunctionCall) otto.Value {
return otto.FalseValue() return otto.FalseValue()
} }
} else { } else {
threads = 4 threads = int64(js.ethereum.MinerThreads)
} }
err = js.ethereum.StartMining(int(threads)) err = js.ethereum.StartMining(int(threads))

View File

@ -190,6 +190,7 @@ type Ethereum struct {
// logger logger.LogSystem // logger logger.LogSystem
Mining bool Mining bool
MinerThreads int
NatSpec bool NatSpec bool
DataDir string DataDir string
etherbase common.Address etherbase common.Address
@ -262,6 +263,7 @@ func New(config *Config) (*Ethereum, error) {
ethVersionId: config.ProtocolVersion, ethVersionId: config.ProtocolVersion,
netVersionId: config.NetworkId, netVersionId: config.NetworkId,
NatSpec: config.NatSpec, NatSpec: config.NatSpec,
MinerThreads: config.MinerThreads,
} }
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())