aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/args.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-10 01:19:35 +0800
committerobscuren <geffobscura@gmail.com>2015-03-10 01:19:35 +0800
commita7538d0020d3a51ab3b25997b3c4f01db87d4c7a (patch)
treeac23a9075dadc07d780c93ffff94f6fc6ce742c6 /rpc/args.go
parent8560004f380dc688a1171ad5aeffa593aae41193 (diff)
downloaddexon-a7538d0020d3a51ab3b25997b3c4f01db87d4c7a.tar.gz
dexon-a7538d0020d3a51ab3b25997b3c4f01db87d4c7a.tar.zst
dexon-a7538d0020d3a51ab3b25997b3c4f01db87d4c7a.zip
merge
Diffstat (limited to 'rpc/args.go')
-rw-r--r--rpc/args.go17
1 files changed, 2 insertions, 15 deletions
diff --git a/rpc/args.go b/rpc/args.go
index d34cfb2fa..63969e598 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -333,7 +333,7 @@ type FilterOptions struct {
Earliest int64
Latest int64
Address interface{}
- Topic []interface{}
+ Topics []interface{}
Skip int
Max int
}
@@ -360,20 +360,7 @@ func (args *FilterOptions) UnmarshalJSON(b []byte) (err error) {
args.Max = int(ethutil.Big(obj[0].Limit).Int64())
args.Skip = int(ethutil.Big(obj[0].Offset).Int64())
args.Address = obj[0].Address
-
- topics := make([][][]byte, len(obj[0].Topics))
- for i, topicDat := range obj[0].Topics {
- if slice, ok := topicDat.([]interface{}); ok {
- topics[i] = make([][]byte, len(slice))
- for j, topic := range slice {
- topics[i][j] = fromHex(topic.(string))
- }
- } else if str, ok := topicDat.(string); ok {
- topics[i] = make([][]byte, 1)
- topics[i][0] = fromHex(str)
- }
- }
- args.Topics = topics
+ args.Topics = obj[0].Topics
return nil
}