aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/ext_app.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-31 17:59:17 +0800
committerobscuren <geffobscura@gmail.com>2014-10-31 17:59:17 +0800
commit3ee0461cb5b6e4a5e2d287180afbdb681805a662 (patch)
treef245667a9e3f5f0ff23bb1c89f4f7cc783f4949c /cmd/mist/ext_app.go
parent8e0a39f33f9d24ebeca9cc88edf24cc6294552d7 (diff)
downloaddexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar
dexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.gz
dexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.bz2
dexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.lz
dexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.xz
dexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.zst
dexon-3ee0461cb5b6e4a5e2d287180afbdb681805a662.zip
Moved ethchain to chain
Diffstat (limited to 'cmd/mist/ext_app.go')
-rw-r--r--cmd/mist/ext_app.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/mist/ext_app.go b/cmd/mist/ext_app.go
index 7680106f0..cb014aec4 100644
--- a/cmd/mist/ext_app.go
+++ b/cmd/mist/ext_app.go
@@ -20,7 +20,7 @@ package main
import (
"encoding/json"
- "github.com/ethereum/go-ethereum/ethchain"
+ "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethpipe"
"github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/event"
@@ -36,7 +36,7 @@ type AppContainer interface {
Window() *qml.Window
Engine() *qml.Engine
- NewBlock(*ethchain.Block)
+ NewBlock(*chain.Block)
NewWatcher(chan bool)
Messages(ethstate.Messages, string)
Post(string, int)
@@ -44,12 +44,12 @@ type AppContainer interface {
type ExtApplication struct {
*ethpipe.JSPipe
- eth ethchain.EthManager
+ eth chain.EthManager
events event.Subscription
watcherQuitChan chan bool
- filters map[string]*ethchain.Filter
+ filters map[string]*chain.Filter
container AppContainer
lib *UiLib
@@ -60,7 +60,7 @@ func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
JSPipe: ethpipe.NewJSPipe(lib.eth),
eth: lib.eth,
watcherQuitChan: make(chan bool),
- filters: make(map[string]*ethchain.Filter),
+ filters: make(map[string]*chain.Filter),
container: container,
lib: lib,
}
@@ -80,7 +80,7 @@ func (app *ExtApplication) run() {
// Subscribe to events
mux := app.lib.eth.EventMux()
- app.events = mux.Subscribe(ethchain.NewBlockEvent{}, ethstate.Messages(nil))
+ app.events = mux.Subscribe(chain.NewBlockEvent{}, ethstate.Messages(nil))
// Call the main loop
go app.mainLoop()
@@ -106,7 +106,7 @@ func (app *ExtApplication) stop() {
func (app *ExtApplication) mainLoop() {
for ev := range app.events.Chan() {
switch ev := ev.(type) {
- case ethchain.NewBlockEvent:
+ case chain.NewBlockEvent:
app.container.NewBlock(ev.Block)
case ethstate.Messages: