forked from cerc-io/plugeth
removed all old filters
This commit is contained in:
parent
253eb778d1
commit
827ea43478
@ -24,7 +24,6 @@ import (
|
|||||||
"github.com/ethereum/go-ethereum/core"
|
"github.com/ethereum/go-ethereum/core"
|
||||||
"github.com/ethereum/go-ethereum/core/types"
|
"github.com/ethereum/go-ethereum/core/types"
|
||||||
"github.com/ethereum/go-ethereum/event"
|
"github.com/ethereum/go-ethereum/event"
|
||||||
"github.com/ethereum/go-ethereum/ui/qt"
|
|
||||||
"github.com/ethereum/go-ethereum/xeth"
|
"github.com/ethereum/go-ethereum/xeth"
|
||||||
"github.com/obscuren/qml"
|
"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)
|
|
||||||
}
|
|
||||||
|
@ -1,30 +1 @@
|
|||||||
package qt
|
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
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user