aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-04 03:38:46 +0800
committerobscuren <geffobscura@gmail.com>2015-03-04 03:38:46 +0800
commite9f1e868e2bc0205d0b7655cd07fcaba9b2bc97d (patch)
treeadd411354ddaa8f3402931a0c674a8efaf3e851a
parentbb152612e0466164d33ff7f2023d804d7db18c01 (diff)
parent827ea4347836033b9d699f3f9b52159adcb16386 (diff)
downloaddexon-e9f1e868e2bc0205d0b7655cd07fcaba9b2bc97d.tar.gz
dexon-e9f1e868e2bc0205d0b7655cd07fcaba9b2bc97d.tar.zst
dexon-e9f1e868e2bc0205d0b7655cd07fcaba9b2bc97d.zip
Merge branch 'develop' into poc-9
-rw-r--r--cmd/mist/ext_app.go5
-rw-r--r--ui/qt/filter.go29
2 files changed, 0 insertions, 34 deletions
diff --git a/cmd/mist/ext_app.go b/cmd/mist/ext_app.go
index 7ac51db0b..84041a553 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/ui/qt"
"github.com/ethereum/go-ethereum/xeth"
"github.com/obscuren/qml"
)
@@ -116,7 +115,3 @@ func (app *ExtApplication) mainLoop() {
}
}
}
-
-func (self *ExtApplication) Watch(filterOptions map[string]interface{}, identifier string) {
- self.filters[identifier] = qt.NewFilterFromMap(filterOptions, self.eth)
-}
diff --git a/ui/qt/filter.go b/ui/qt/filter.go
index 48e8a7fae..090260e4e 100644
--- a/ui/qt/filter.go
+++ b/ui/qt/filter.go
@@ -1,30 +1 @@
package qt
-
-import (
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/ui"
- "github.com/obscuren/qml"
-)
-
-func NewFilterFromMap(object map[string]interface{}, eth core.Backend) *core.Filter {
- filter := ui.NewFilterFromMap(object, eth)
-
- if object["topics"] != nil {
- filter.SetTopics(makeTopics(object["topics"]))
- }
-
- return filter
-}
-
-func makeTopics(v interface{}) (d [][]byte) {
- if qList, ok := v.(*qml.List); ok {
- var s []string
- qList.Convert(&s)
-
- d = ui.MakeTopics(s)
- } else if str, ok := v.(string); ok {
- d = ui.MakeTopics(str)
- }
-
- return
-}