aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-20 05:46:15 +0800
committerobscuren <geffobscura@gmail.com>2015-02-20 05:46:15 +0800
commit000658539136645e743d83d57a8106b2a9796b93 (patch)
treeca37fb68b6b7574d7c888968813598e68d301659 /miner
parentfa4cbad315609e41d88c59ecbce7c6c6169fc57a (diff)
parent639ac5c3daa253f36d41672165a5727d8eba207e (diff)
downloadgo-tangerine-000658539136645e743d83d57a8106b2a9796b93.tar.gz
go-tangerine-000658539136645e743d83d57a8106b2a9796b93.tar.zst
go-tangerine-000658539136645e743d83d57a8106b2a9796b93.zip
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'miner')
-rw-r--r--miner/miner.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/miner/miner.go b/miner/miner.go
index 27afcf684..0cc2361c8 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -20,13 +20,13 @@ type Miner struct {
mining bool
}
-func New(coinbase []byte, eth core.Backend) *Miner {
+func New(coinbase []byte, eth core.Backend, minerThreads int) *Miner {
miner := &Miner{
Coinbase: coinbase,
worker: newWorker(coinbase, eth),
}
- for i := 0; i < 4; i++ {
+ for i := 0; i < minerThreads; i++ {
miner.worker.register(NewCpuMiner(i, ezp.New()))
}