diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
| commit | 4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8 (patch) | |
| tree | 1cc4369855586a5b59406d09299e89f8e3f9142d /miner/miner.go | |
| parent | cfe037028081ebb84ee35caa5b16fed5d125b58a (diff) | |
| parent | 65cad14f9b27db396d036f47814d4843d947ac43 (diff) | |
| download | dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.gz dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.bz2 dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.lz dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.xz dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.zst dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into removews
Conflicts:
cmd/ethereum/flags.go
cmd/mist/flags.go
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/miner/miner.go b/miner/miner.go index 0cc2361c8..6b416be8e 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -52,10 +52,5 @@ func (self *Miner) Stop() { } func (self *Miner) HashRate() int64 { - var tot int64 - for _, agent := range self.worker.agents { - tot += agent.Pow().GetHashrate() - } - - return tot + return self.worker.HashRate() } |