aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/responses.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-21 21:54:25 +0800
committerobscuren <geffobscura@gmail.com>2015-03-21 21:54:25 +0800
commit83728e4b6496fddd0444a5e276c03159d6f5c6eb (patch)
tree575f414d5c1542e22f3fabbece1cf1d64916d07c /rpc/responses.go
parenta7ad9c309bf72a9f2b4f12001034e1842ca55319 (diff)
parent004f5008ff2fe33e862d3f86dd3edd2f7d3a4694 (diff)
downloadgo-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.tar
go-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.tar.gz
go-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.tar.bz2
go-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.tar.lz
go-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.tar.xz
go-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.tar.zst
go-tangerine-83728e4b6496fddd0444a5e276c03159d6f5c6eb.zip
Merge branch 'develop' into conversion
Conflicts: rpc/responses.go
Diffstat (limited to 'rpc/responses.go')
-rw-r--r--rpc/responses.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/rpc/responses.go b/rpc/responses.go
index ce64f1581..1ec5f08eb 100644
--- a/rpc/responses.go
+++ b/rpc/responses.go
@@ -219,7 +219,7 @@ type FilterWhisperRes struct {
type LogRes struct {
Address string `json:"address"`
- Topic []string `json:"topic"`
+ Topics []string `json:"topics"`
Data string `json:"data"`
Number uint64 `json:"number"`
}
@@ -229,12 +229,12 @@ func NewLogsRes(logs state.Logs) (ls []LogRes) {
for i, log := range logs {
var l LogRes
- l.Topic = make([]string, len(log.Topics()))
+ l.Topics = make([]string, len(log.Topics()))
l.Address = log.Address().Hex()
l.Data = common.ToHex(log.Data())
l.Number = log.Number()
for j, topic := range log.Topics() {
- l.Topic[j] = topic.Hex()
+ l.Topics[j] = topic.Hex()
}
ls[i] = l
}