interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into conversion 

Conflicts:
	rpc/responses.go
This commit is contained in:
obscuren 2015-03-21 14:54:25 +01:00
parent a7ad9c309b 004f5008ff
commit 83728e4b64
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/responses.go
View File

@ -219,7 +219,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"`
} }
@ -229,12 +229,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 = log.Address().Hex() l.Address = log.Address().Hex()
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] = topic.Hex() l.Topics[j] = topic.Hex()
} }
ls[i] = l ls[i] = l
} }