Merge remote-tracking branch 'upstream/develop' into evmjit

1 files changed, 1 insertions, 27 deletions

diff --git a/cmd/mist/ext_app.go b/cmd/mist/ext_app.go
index 20ec52e60..7ac51db0b 100644
--- a/cmd/mist/ext_app.go
+++ b/cmd/mist/ext_app.go
@@ -24,7 +24,6 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/ui/qt"
 	"github.com/ethereum/go-ethereum/xeth"
 	"github.com/obscuren/qml"
@@ -39,13 +38,12 @@ type AppContainer interface {
 
 	NewBlock(*types.Block)
 	NewWatcher(chan bool)
-	Messages(state.Messages, string)
 	Post(string, int)
 }
 
 type ExtApplication struct {
 	*xeth.XEth
-	eth core.EthManager
+	eth core.Backend
 
 	events          event.Subscription
 	watcherQuitChan chan bool
@@ -79,10 +77,6 @@ func (app *ExtApplication) run() {
 		return
 	}
 
-	// Subscribe to events
-	mux := app.lib.eth.EventMux()
-	app.events = mux.Subscribe(core.NewBlockEvent{}, state.Messages(nil))
-
 	// Call the main loop
 	go app.mainLoop()
 
@@ -126,23 +120,3 @@ func (app *ExtApplication) mainLoop() {
 func (self *ExtApplication) Watch(filterOptions map[string]interface{}, identifier string) {
 	self.filters[identifier] = qt.NewFilterFromMap(filterOptions, self.eth)
 }
-
-func (self *ExtApplication) GetMessages(object map[string]interface{}) string {
-	/* TODO remove me
-	filter := qt.NewFilterFromMap(object, self.eth)
-
-	messages := filter.Find()
-	var msgs []javascript.JSMessage
-	for _, m := range messages {
-		msgs = append(msgs, javascript.NewJSMessage(m))
-	}
-
-	b, err := json.Marshal(msgs)
-	if err != nil {
-		return "{\"error\":" + err.Error() + "}"
-	}
-
-	return string(b)
-	*/
-	return ""
-}