gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to reflect the Filter changes in eth-go

Browse Source
This commit is contained in:
obscuren
2014-10-18 13:20:35 +02:00
parent e57989c0a6
commit 77badc8c46
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/types.go
View File

@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethpipe"
"github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethstate"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ui"
"github.com/obscuren/otto" "github.com/obscuren/otto"
) )
@@ -128,7 +128,7 @@ func (self *JSEthereum) toVal(v interface{}) otto.Value {
} }
func (self *JSEthereum) Messages(object map[string]interface{}) otto.Value { func (self *JSEthereum) Messages(object map[string]interface{}) otto.Value {
filter := ethchain.NewFilterFromMap(object, self.ethereum) filter := ui.NewFilterFromMap(object, self.ethereum)
messages := filter.Find() messages := filter.Find()
var msgs []JSMessage var msgs []JSMessage

5
mist/ext_app.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethpipe"
"github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethstate"
"github.com/ethereum/eth-go/event" "github.com/ethereum/eth-go/event"
"github.com/ethereum/eth-go/ui/qt"
"github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/javascript"
"gopkg.in/qml.v1" "gopkg.in/qml.v1"
) )
@@ -103,11 +104,11 @@ func (app *ExtApplication) mainLoop() {
} }
func (self *ExtApplication) Watch(filterOptions map[string]interface{}, identifier string) { func (self *ExtApplication) Watch(filterOptions map[string]interface{}, identifier string) {
self.filters[identifier] = ethchain.NewFilterFromMap(filterOptions, self.eth) self.filters[identifier] = qt.NewFilterFromMap(filterOptions, self.eth)
} }
func (self *ExtApplication) GetMessages(object map[string]interface{}) string { func (self *ExtApplication) GetMessages(object map[string]interface{}) string {
filter := ethchain.NewFilterFromMap(object, self.eth) filter := qt.NewFilterFromMap(object, self.eth)
messages := filter.Find() messages := filter.Find()
var msgs []javascript.JSMessage var msgs []javascript.JSMessage

3
mist/ui_lib.go
View File

@@ -13,6 +13,7 @@ import (
"github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethpipe"
"github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethstate"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ui/qt"
"github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/javascript"
"gopkg.in/qml.v1" "gopkg.in/qml.v1"
) )
@@ -194,7 +195,7 @@ func (self *UiLib) StartDebugger() {
} }
func (self *UiLib) NewFilter(object map[string]interface{}) (id int) { func (self *UiLib) NewFilter(object map[string]interface{}) (id int) {
filter := ethchain.NewFilterFromMap(object, self.eth) filter := qt.NewFilterFromMap(object, self.eth)
filter.MessageCallback = func(messages ethstate.Messages) { filter.MessageCallback = func(messages ethstate.Messages) {
self.win.Root().Call("invokeFilterCallback", ethpipe.ToJSMessages(messages), id) self.win.Root().Call("invokeFilterCallback", ethpipe.ToJSMessages(messages), id)
} }