removed messages

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,7 +38,6 @@ type AppContainer interface {
 
 	NewBlock(*types.Block)
 	NewWatcher(chan bool)
-	Messages(state.Messages, string)
 	Post(string, int)
 }
 
@@ -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 ""
-}

cmd/mist/html_container.go

@@ -31,7 +31,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
 	"github.com/howeyc/fsnotify"
 	"github.com/obscuren/qml"
@@ -144,19 +143,6 @@ func (app *HtmlApplication) NewBlock(block *types.Block) {
 	app.webView.Call("onNewBlockCb", b)
 }
 
-func (self *HtmlApplication) Messages(messages state.Messages, id string) {
-	/* TODO remove me
-	var msgs []javascript.JSMessage
-	for _, m := range messages {
-		msgs = append(msgs, javascript.NewJSMessage(m))
-	}
-
-	b, _ := json.Marshal(msgs)
-
-	self.webView.Call("onWatchedCb", string(b), id)
-	*/
-}
-
 func (app *HtmlApplication) Destroy() {
 	app.engine.Destroy()
 }

cmd/mist/qml_container.go

@@ -22,12 +22,10 @@
 package main
 
 import (
-	"fmt"
 	"runtime"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
 	"github.com/obscuren/qml"
 )
@@ -74,10 +72,6 @@ func (app *QmlApplication) NewBlock(block *types.Block) {
 	app.win.Call("onNewBlockCb", pblock)
 }
 
-func (self *QmlApplication) Messages(msgs state.Messages, id string) {
-	fmt.Println("IMPLEMENT QML APPLICATION MESSAGES METHOD")
-}
-
 // Getters
 func (app *QmlApplication) Engine() *qml.Engine {
 	return app.engine

ethdb/database.go

 package ethdb
 
 import (
-	"fmt"
 	"path"
+	"fmt"
 
-	"github.com/ethereum/go-ethereum/compression/rle"
 	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/compression/rle"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 )

xeth/types.go

@@ -235,33 +235,3 @@ func NewReciept(contractCreation bool, creationAddress, hash, address []byte) *R
 		toHex(address),
 	}
 }
-
-type Message struct {
-	To        string `json:"to"`
-	From      string `json:"from"`
-	Input     string `json:"input"`
-	Output    string `json:"output"`
-	Path      int32  `json:"path"`
-	Origin    string `json:"origin"`
-	Timestamp int32  `json:"timestamp"`
-	Coinbase  string `json:"coinbase"`
-	Block     string `json:"block"`
-	Number    int32  `json:"number"`
-	Value     string `json:"value"`
-}
-
-func NewMessage(message *state.Message) Message {
-	return Message{
-		To:        toHex(message.To),
-		From:      toHex(message.From),
-		Input:     toHex(message.Input),
-		Output:    toHex(message.Output),
-		Path:      int32(message.Path),
-		Origin:    toHex(message.Origin),
-		Timestamp: int32(message.Timestamp),
-		Coinbase:  toHex(message.Origin),
-		Block:     toHex(message.Block),
-		Number:    int32(message.Number.Int64()),
-		Value:     message.Value.String(),
-	}
-}

xeth/xeth.go

@@ -192,15 +192,6 @@ func (self *XEth) FromNumber(str string) string {
 	return ethutil.BigD(fromHex(str)).String()
 }
 
-func ToMessages(messages state.Messages) *ethutil.List {
-	var msgs []Message
-	for _, m := range messages {
-		msgs = append(msgs, NewMessage(m))
-	}
-
-	return ethutil.NewList(msgs)
-}
-
 func (self *XEth) PushTx(encodedTx string) (string, error) {
 	tx := types.NewTransactionFromBytes(fromHex(encodedTx))
 	err := self.eth.TxPool().Add(tx)