Merge branch 'rpcfrontier' into develop

This commit is contained in:
obscuren 2015-03-21 14:53:12 +01:00
commit 004f5008ff

View File

@ -215,7 +215,7 @@ type FilterWhisperRes struct {
type LogRes struct { type LogRes struct {
Address string `json:"address"` Address string `json:"address"`
Topic []string `json:"topic"` Topics []string `json:"topics"`
Data string `json:"data"` Data string `json:"data"`
Number uint64 `json:"number"` Number uint64 `json:"number"`
} }
@ -225,12 +225,12 @@ func NewLogsRes(logs state.Logs) (ls []LogRes) {
for i, log := range logs { for i, log := range logs {
var l LogRes var l LogRes
l.Topic = make([]string, len(log.Topics())) l.Topics = make([]string, len(log.Topics()))
l.Address = common.ToHex(log.Address()) l.Address = common.ToHex(log.Address())
l.Data = common.ToHex(log.Data()) l.Data = common.ToHex(log.Data())
l.Number = log.Number() l.Number = log.Number()
for j, topic := range log.Topics() { for j, topic := range log.Topics() {
l.Topic[j] = common.ToHex(topic) l.Topics[j] = common.ToHex(topic)
} }
ls[i] = l ls[i] = l
} }