Updated assets & moved messages

This commit is contained in:
obscuren
2015-01-28 14:02:36 +01:00
parent cbf162ca64
commit 9a11a94894
9 changed files with 81 additions and 65 deletions

View File

@ -21,12 +21,9 @@
package main
import (
"encoding/json"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/javascript"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/ui/qt"
"github.com/ethereum/go-ethereum/xeth"
@ -113,13 +110,15 @@ func (app *ExtApplication) mainLoop() {
case core.NewBlockEvent:
app.container.NewBlock(ev.Block)
case state.Messages:
for id, filter := range app.filters {
msgs := filter.FilterMessages(ev)
if len(msgs) > 0 {
app.container.Messages(msgs, id)
/* TODO remove
case state.Messages:
for id, filter := range app.filters {
msgs := filter.FilterMessages(ev)
if len(msgs) > 0 {
app.container.Messages(msgs, id)
}
}
}
*/
}
}
}
@ -129,6 +128,7 @@ func (self *ExtApplication) Watch(filterOptions map[string]interface{}, identifi
}
func (self *ExtApplication) GetMessages(object map[string]interface{}) string {
/* TODO remove me
filter := qt.NewFilterFromMap(object, self.eth)
messages := filter.Find()
@ -143,4 +143,6 @@ func (self *ExtApplication) GetMessages(object map[string]interface{}) string {
}
return string(b)
*/
return ""
}