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

reworking messages => log

Browse Source
This commit is contained in:
obscuren
2015-01-28 10:23:18 +01:00
parent c54a85ee64
commit f3e78c8f3c
5 changed files with 76 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ui/filter.go
View File

@ -28,14 +28,9 @@ func NewFilterFromMap(object map[string]interface{}, eth core.EthManager) *core.
filter.SetLatestBlock(val.Int())
}
if object["to"] != nil {
val := ethutil.NewValue(object["to"])
filter.AddTo(fromHex(val.Str()))
}
if object["from"] != nil {
val := ethutil.NewValue(object["from"])
filter.AddFrom(fromHex(val.Str()))
if object["address"] != nil {
val := ethutil.NewValue(object["address"])
filter.SetAddress(fromHex(val.Str()))
}
if object["max"] != nil {
@ -48,8 +43,8 @@ func NewFilterFromMap(object map[string]interface{}, eth core.EthManager) *core.
filter.SetSkip(int(val.Uint()))
}
if object["altered"] != nil {
filter.Altered = makeAltered(object["altered"])
if object["topics"] != nil {
filter.SetTopics(MakeTopics(object["topics"]))
}
return filter
@ -70,16 +65,13 @@ func mapToAccountChange(m map[string]interface{}) (d core.AccountChange) {
// data can come in in the following formats:
// ["aabbccdd", {id: "ccddee", at: "11223344"}], "aabbcc", {id: "ccddee", at: "1122"}
func makeAltered(v interface{}) (d []core.AccountChange) {
func MakeTopics(v interface{}) (d [][]byte) {
if str, ok := v.(string); ok {
d = append(d, core.AccountChange{fromHex(str), nil})
} else if obj, ok := v.(map[string]interface{}); ok {
d = append(d, mapToAccountChange(obj))
} else if slice, ok := v.([]interface{}); ok {
d = append(d, fromHex(str))
} else if slice, ok := v.([]string); ok {
for _, item := range slice {
d = append(d, makeAltered(item)...)
d = append(d, fromHex(item))
}
}
return
}

17
ui/qt/filter.go
View File

@ -9,24 +9,21 @@ import (
func NewFilterFromMap(object map[string]interface{}, eth core.EthManager) *core.Filter {
filter := ui.NewFilterFromMap(object, eth)
if object["altered"] != nil {
filter.Altered = makeAltered(object["altered"])
if object["topics"] != nil {
filter.SetTopics(makeTopics(object["topics"]))
}
return filter
}
func makeAltered(v interface{}) (d []core.AccountChange) {
func makeTopics(v interface{}) (d [][]byte) {
if qList, ok := v.(*qml.List); ok {
var s []interface{}
var s []string
qList.Convert(&s)
d = makeAltered(s)
} else if qMap, ok := v.(*qml.Map); ok {
var m map[string]interface{}
qMap.Convert(&m)
d = makeAltered(m)
d = ui.MakeTopics(s)
} else if str, ok := v.(string); ok {
d = ui.MakeTopics(str)
}
return