diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-14 19:05:27 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-14 19:05:27 +0800 |
| commit | c7a13c9be86417848582a2ab6704586f92dff27c (patch) | |
| tree | a1e7634f3980a5d0adf85d8d3ee7ff7cae8d3a6b /miner/miner.go | |
| parent | 2b06fe3eff50c117db88a3184c7851f62bb14b9d (diff) | |
| parent | b24f16fa532483e0714700d687f134fb373f2487 (diff) | |
| download | dexon-c7a13c9be86417848582a2ab6704586f92dff27c.tar dexon-c7a13c9be86417848582a2ab6704586f92dff27c.tar.gz dexon-c7a13c9be86417848582a2ab6704586f92dff27c.tar.bz2 dexon-c7a13c9be86417848582a2ab6704586f92dff27c.tar.lz dexon-c7a13c9be86417848582a2ab6704586f92dff27c.tar.xz dexon-c7a13c9be86417848582a2ab6704586f92dff27c.tar.zst dexon-c7a13c9be86417848582a2ab6704586f92dff27c.zip | |
Merge pull request #969 from Gustav-Simonsson/ethash_improve_hashrate_update2
Make read of ethash hashrate atomic and update ethash godep
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/miner.go b/miner/miner.go index 09342e250..8143fcef7 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -70,7 +70,7 @@ func (self *Miner) Register(agent Agent) { } func (self *Miner) HashRate() int64 { - return self.worker.HashRate() + return self.pow.GetHashrate() } func (self *Miner) SetExtra(extra []byte) { |