aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/gui.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-03-27 04:08:15 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-03-27 04:08:15 +0800
commit829240c3252d9da09c9000e42b0686425a313e8b (patch)
tree5b5fe5aeb443a8fd8a325743490b8fb416a903d3 /cmd/mist/gui.go
parent658204bafcba6332e979aee690dc5cff6e46fb42 (diff)
parent7577d1261403dbabdb30e21415d34b4e5da466ec (diff)
downloaddexon-829240c3252d9da09c9000e42b0686425a313e8b.tar
dexon-829240c3252d9da09c9000e42b0686425a313e8b.tar.gz
dexon-829240c3252d9da09c9000e42b0686425a313e8b.tar.bz2
dexon-829240c3252d9da09c9000e42b0686425a313e8b.tar.lz
dexon-829240c3252d9da09c9000e42b0686425a313e8b.tar.xz
dexon-829240c3252d9da09c9000e42b0686425a313e8b.tar.zst
dexon-829240c3252d9da09c9000e42b0686425a313e8b.zip
Merge pull request #550 from ethersphere/frontier/cli-key
import/export accounts
Diffstat (limited to 'cmd/mist/gui.go')
-rw-r--r--cmd/mist/gui.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 08f02f833..d37d6f81b 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -25,6 +25,7 @@ import "C"
import (
"encoding/json"
"fmt"
+ "io/ioutil"
"math/big"
"path"
"runtime"
@@ -91,8 +92,8 @@ func NewWindow(ethereum *eth.Ethereum) *Gui {
plugins: make(map[string]plugin),
serviceEvents: make(chan ServEv, 1),
}
- data, _ := common.ReadAllFile(path.Join(ethereum.DataDir, "plugins.json"))
- json.Unmarshal([]byte(data), &gui.plugins)
+ data, _ := ioutil.ReadFile(path.Join(ethereum.DataDir, "plugins.json"))
+ json.Unmarshal(data, &gui.plugins)
return gui
}