aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/ext_app.go
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-01-29 02:01:15 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-01-29 02:01:15 +0800
commit21fd31dad8bc6e0291ca405314b516670333c707 (patch)
tree34aa6f6d0e1f5c7316f0220f6e0569f916307fa3 /cmd/mist/ext_app.go
parenta88f609b8ab1e20eb2564d47605985d6b8f593e8 (diff)
parent872b2497114209119becf2e8a4d4a5818e2084ee (diff)
downloaddexon-21fd31dad8bc6e0291ca405314b516670333c707.tar
dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.gz
dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.bz2
dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.lz
dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.xz
dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.zst
dexon-21fd31dad8bc6e0291ca405314b516670333c707.zip
Merge branch 'jsonrpc' of github.com:ethereum/go-ethereum into jsonrpc
Diffstat (limited to 'cmd/mist/ext_app.go')
-rw-r--r--cmd/mist/ext_app.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mist/ext_app.go b/cmd/mist/ext_app.go
index 012c94923..bc856cd72 100644
--- a/cmd/mist/ext_app.go
+++ b/cmd/mist/ext_app.go
@@ -47,7 +47,7 @@ type AppContainer interface {
}
type ExtApplication struct {
- *xeth.JSXEth
+ *xeth.XEth
eth core.EthManager
events event.Subscription
@@ -61,7 +61,7 @@ type ExtApplication struct {
func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
return &ExtApplication{
- JSXEth: xeth.NewJSXEth(lib.eth),
+ XEth: xeth.New(lib.eth),
eth: lib.eth,
watcherQuitChan: make(chan bool),
filters: make(map[string]*core.Filter),