diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-21 05:47:27 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-21 05:47:27 +0800 |
| commit | 81800ca39ea03da7f63d8ecfbd74773f4ca73323 (patch) | |
| tree | 6d56577858304d970c7754bcd5ac24c2b282f079 /miner | |
| parent | b95ff54632d9a31286f5b629556071b6043d274a (diff) | |
| parent | f4e9638867f5dab01eeb6db5fdbd85737a11fbd6 (diff) | |
| download | go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.gz go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.bz2 go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.lz go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.xz go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.zst go-tangerine-81800ca39ea03da7f63d8ecfbd74773f4ca73323.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/agent.go | 4 | ||||
| -rw-r--r-- | miner/worker.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/miner/agent.go b/miner/agent.go index 6865d5a08..64491e04c 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -79,3 +79,7 @@ func (self *CpuMiner) mine(block *types.Block) { self.returnCh <- Work{block.Number().Uint64(), nonce, mixDigest, seedHash} } } + +func (self *CpuMiner) GetHashRate() int64 { + return self.pow.GetHashrate() +} diff --git a/miner/worker.go b/miner/worker.go index 63d1bfa0b..ae6782aca 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -57,7 +57,7 @@ type Agent interface { SetWorkCh(chan<- Work) Stop() Start() - Pow() pow.PoW + GetHashRate() int64 } type worker struct { @@ -272,7 +272,7 @@ func (self *worker) commitTransaction(tx *types.Transaction) error { func (self *worker) HashRate() int64 { var tot int64 for _, agent := range self.agents { - tot += agent.Pow().GetHashrate() + tot += agent.GetHashRate() } return tot |