gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into poc-9

Browse Source
This commit is contained in:
obscuren
2015-03-05 17:37:18 +01:00
parent 12ca70537f 201b09f99a
commit 377c8a13de
27 changed files with 544 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/mist/gui.go
View File

@ -32,7 +32,6 @@ import (
"path"
"runtime"
"sort"
"strconv"
"time"
"github.com/ethereum/go-ethereum/core"
@ -386,7 +385,7 @@ func (gui *Gui) update() {
statsUpdateTicker := time.NewTicker(5 * time.Second)
lastBlockLabel := gui.getObjectByName("lastBlockLabel")
miningLabel := gui.getObjectByName("miningLabel")
//miningLabel := gui.getObjectByName("miningLabel")
events := gui.eth.EventMux().Subscribe(
core.ChainEvent{},
@ -417,8 +416,7 @@ func (gui *Gui) update() {
case <-generalUpdateTicker.C:
statusText := "#" + gui.eth.ChainManager().CurrentBlock().Number().String()
lastBlockLabel.Set("text", statusText)
miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.Miner().HashRate(), 10)+"/Khash")
//miningLabel.Set("text", strconv.FormatInt(gui.uiLib.Miner().HashRate(), 10))
case <-statsUpdateTicker.C:
gui.setStatsPane()
}