forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved Filter's wrapping functions to their own util package. Fixes et…
…hereum#61 * CLI ethereum should no longer require the Qt/QML package
- Loading branch information
Showing
3 changed files
with
122 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package ui | ||
|
|
||
| import ( | ||
| "github.com/ethereum/eth-go/ethchain" | ||
| "github.com/ethereum/eth-go/ethutil" | ||
| ) | ||
|
|
||
| func NewFilterFromMap(object map[string]interface{}, eth ethchain.EthManager) *ethchain.Filter { | ||
| filter := ethchain.NewFilter(eth) | ||
|
|
||
| if object["earliest"] != nil { | ||
| val := ethutil.NewValue(object["earliest"]) | ||
| filter.SetEarliestBlock(val.Int()) | ||
| } | ||
|
|
||
| if object["latest"] != nil { | ||
| val := ethutil.NewValue(object["latest"]) | ||
| filter.SetLatestBlock(val.Int()) | ||
| } | ||
|
|
||
| if object["to"] != nil { | ||
| val := ethutil.NewValue(object["to"]) | ||
| filter.AddTo(ethutil.Hex2Bytes(val.Str())) | ||
| } | ||
|
|
||
| if object["from"] != nil { | ||
| val := ethutil.NewValue(object["from"]) | ||
| filter.AddFrom(ethutil.Hex2Bytes(val.Str())) | ||
| } | ||
|
|
||
| if object["max"] != nil { | ||
| val := ethutil.NewValue(object["max"]) | ||
| filter.SetMax(int(val.Uint())) | ||
| } | ||
|
|
||
| if object["skip"] != nil { | ||
| val := ethutil.NewValue(object["skip"]) | ||
| filter.SetSkip(int(val.Uint())) | ||
| } | ||
|
|
||
| if object["altered"] != nil { | ||
| filter.Altered = makeAltered(object["altered"]) | ||
| } | ||
|
|
||
| return filter | ||
| } | ||
|
|
||
| // Conversion methodn | ||
| func mapToAccountChange(m map[string]interface{}) (d ethchain.AccountChange) { | ||
| if str, ok := m["id"].(string); ok { | ||
| d.Address = ethutil.Hex2Bytes(str) | ||
| } | ||
|
|
||
| if str, ok := m["at"].(string); ok { | ||
| d.StateAddress = ethutil.Hex2Bytes(str) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // data can come in in the following formats: | ||
| // ["aabbccdd", {id: "ccddee", at: "11223344"}], "aabbcc", {id: "ccddee", at: "1122"} | ||
| func makeAltered(v interface{}) (d []ethchain.AccountChange) { | ||
| if str, ok := v.(string); ok { | ||
| d = append(d, ethchain.AccountChange{ethutil.Hex2Bytes(str), nil}) | ||
| } else if obj, ok := v.(map[string]interface{}); ok { | ||
| d = append(d, mapToAccountChange(obj)) | ||
| } else if slice, ok := v.([]interface{}); ok { | ||
| for _, item := range slice { | ||
| d = append(d, makeAltered(item)...) | ||
| } | ||
| } | ||
|
|
||
| return | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package qt | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/ethereum/eth-go/ethchain" | ||
| "github.com/ethereum/eth-go/ui" | ||
| "gopkg.in/qml.v1" | ||
| ) | ||
|
|
||
| func NewFilterFromMap(object map[string]interface{}, eth ethchain.EthManager) *ethchain.Filter { | ||
| filter := ui.NewFilterFromMap(object, eth) | ||
|
|
||
| if object["altered"] != nil { | ||
| filter.Altered = makeAltered(object["altered"]) | ||
| } | ||
|
|
||
| return filter | ||
| } | ||
|
|
||
| func makeAltered(v interface{}) (d []ethchain.AccountChange) { | ||
| if qList, ok := v.(*qml.List); ok { | ||
| var s []interface{} | ||
| qList.Convert(&s) | ||
|
|
||
| fmt.Println(s) | ||
|
|
||
| d = makeAltered(s) | ||
| } else if qMap, ok := v.(*qml.Map); ok { | ||
| var m map[string]interface{} | ||
| qMap.Convert(&m) | ||
| fmt.Println(m) | ||
|
|
||
| d = makeAltered(m) | ||
| } | ||
|
|
||
| return | ||
| } |