diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
| commit | abb9b7f46ff3b2ef0bb4f2e95f029591688768c4 (patch) | |
| tree | c4088c788b3e86935a2b8fd2fbe157340476f091 /cmd/mist/gui.go | |
| parent | fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae (diff) | |
| parent | c934222a8089b19587242a3b0bc71ea0aec1d5ef (diff) | |
| download | go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.gz go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.bz2 go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.lz go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.xz go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.zst go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 208b553d2..9ce6ba650 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -41,7 +41,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/ui/qt/qwhisper" "github.com/ethereum/go-ethereum/xeth" "github.com/obscuren/qml" @@ -81,8 +80,6 @@ type Gui struct { config *ethutil.ConfigManager plugins map[string]plugin - - miner *miner.Miner } // Create GUI, but doesn't start it @@ -454,7 +451,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", "Mining @ "+strconv.FormatInt(gui.uiLib.Miner().HashRate(), 10)+"/Khash") /* blockLength := gui.eth.BlockPool().BlocksProcessed |