diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-18 19:20:35 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-18 19:20:35 +0800 |
| commit | 77badc8c4603674c5fd587150de104e553fce71f (patch) | |
| tree | e4bb486c9e8fce8459c5d6e2ad3d01e699a46c4e | |
| parent | e57989c0a638ff4c2e9ccda4229c732d3ced29a7 (diff) | |
| download | dexon-77badc8c4603674c5fd587150de104e553fce71f.tar dexon-77badc8c4603674c5fd587150de104e553fce71f.tar.gz dexon-77badc8c4603674c5fd587150de104e553fce71f.tar.bz2 dexon-77badc8c4603674c5fd587150de104e553fce71f.tar.lz dexon-77badc8c4603674c5fd587150de104e553fce71f.tar.xz dexon-77badc8c4603674c5fd587150de104e553fce71f.tar.zst dexon-77badc8c4603674c5fd587150de104e553fce71f.zip | |
Updated to reflect the Filter changes in eth-go
| -rw-r--r-- | javascript/types.go | 4 | ||||
| -rw-r--r-- | mist/ext_app.go | 5 | ||||
| -rw-r--r-- | mist/ui_lib.go | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/javascript/types.go b/javascript/types.go index 53a2977a8..560960f54 100644 --- a/javascript/types.go +++ b/javascript/types.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ui" "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 { - filter := ethchain.NewFilterFromMap(object, self.ethereum) + filter := ui.NewFilterFromMap(object, self.ethereum) messages := filter.Find() var msgs []JSMessage diff --git a/mist/ext_app.go b/mist/ext_app.go index 36241e58c..c4e6fd394 100644 --- a/mist/ext_app.go +++ b/mist/ext_app.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/event" + "github.com/ethereum/eth-go/ui/qt" "github.com/ethereum/go-ethereum/javascript" "gopkg.in/qml.v1" ) @@ -103,11 +104,11 @@ func (app *ExtApplication) mainLoop() { } 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 { - filter := ethchain.NewFilterFromMap(object, self.eth) + filter := qt.NewFilterFromMap(object, self.eth) messages := filter.Find() var msgs []javascript.JSMessage diff --git a/mist/ui_lib.go b/mist/ui_lib.go index 27b19763b..90ba0bbaf 100644 --- a/mist/ui_lib.go +++ b/mist/ui_lib.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ui/qt" "github.com/ethereum/go-ethereum/javascript" "gopkg.in/qml.v1" ) @@ -194,7 +195,7 @@ func (self *UiLib) StartDebugger() { } 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) { self.win.Root().Call("invokeFilterCallback", ethpipe.ToJSMessages(messages), id) } |