diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-21 00:42:09 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-21 00:42:09 +0800 |
| commit | 54dac59285ccc6a3af47201479ca556da2899e93 (patch) | |
| tree | 8f753059c4f1799046fa10a861884944a5f453fc /miner | |
| parent | a59bb053f4d2a4a28341c645c051c4c323581a1b (diff) | |
| download | dexon-54dac59285ccc6a3af47201479ca556da2899e93.tar dexon-54dac59285ccc6a3af47201479ca556da2899e93.tar.gz dexon-54dac59285ccc6a3af47201479ca556da2899e93.tar.bz2 dexon-54dac59285ccc6a3af47201479ca556da2899e93.tar.lz dexon-54dac59285ccc6a3af47201479ca556da2899e93.tar.xz dexon-54dac59285ccc6a3af47201479ca556da2899e93.tar.zst dexon-54dac59285ccc6a3af47201479ca556da2899e93.zip | |
wip
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 |