diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 00:55:29 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 00:55:29 +0800 |
| commit | 53b5a45856c5d4c307dc55b4ae1b46efd9471142 (patch) | |
| tree | 56eb1f936610cc461742d2bb08431e304870e85a /miner/miner.go | |
| parent | b0aaa77f0213cb525a873c3bea92e8a06cff423f (diff) | |
| parent | 313fe3861b3c338b3b6304adac46c86af7e2d52e (diff) | |
| download | go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.gz go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.bz2 go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.lz go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.xz go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.zst go-tangerine-53b5a45856c5d4c307dc55b4ae1b46efd9471142.zip | |
Merge branch 'xcthulhu-publictests' into poc-9
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/miner/miner.go b/miner/miner.go index 0cc2361c8..f207948a5 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/pow/ezp" + "github.com/ethereum/go-ethereum/pow" ) var minerlogger = logger.NewLogger("MINER") @@ -18,16 +18,19 @@ type Miner struct { Coinbase []byte mining bool + + pow pow.PoW } -func New(coinbase []byte, eth core.Backend, minerThreads int) *Miner { +func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Miner { miner := &Miner{ Coinbase: coinbase, worker: newWorker(coinbase, eth), + pow: pow, } for i := 0; i < minerThreads; i++ { - miner.worker.register(NewCpuMiner(i, ezp.New())) + miner.worker.register(NewCpuMiner(i, miner.pow)) } return miner |