certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

types: Result and Validator use data.Bytes

This commit is contained in:
Ethan Buchman 2017-04-27 19:18:53 -04:00
parent c709d3cc85
commit 8339dc3b1a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
types/result.go
View File

@ -2,12 +2,14 @@ package types
import ( import (
"fmt" "fmt"
"github.com/tendermint/go-wire/data"
) )
// CONTRACT: a zero Result is OK. // CONTRACT: a zero Result is OK.
type Result struct { type Result struct {
Code CodeType Code CodeType
Data []byte Data data.Bytes
Log string // Can be non-deterministic Log string // Can be non-deterministic
} }

10
types/validators.go
View File

@ -2,8 +2,9 @@ package types
import ( import (
"bytes" "bytes"
"encoding/json"
"github.com/tendermint/go-wire" "github.com/tendermint/go-wire/data"
) )
// validators implements sort // validators implements sort
@ -28,8 +29,8 @@ func (v Validators) Swap(i, j int) {
//------------------------------------- //-------------------------------------
type validatorPretty struct { type validatorPretty struct {
PubKey []byte `json:"pub_key"` PubKey data.Bytes `json:"pub_key"`
Power uint64 `json:"power"` Power uint64 `json:"power"`
} }
func ValidatorsString(vs Validators) string { func ValidatorsString(vs Validators) string {
@ -37,5 +38,6 @@ func ValidatorsString(vs Validators) string {
for i, v := range vs { for i, v := range vs {
s[i] = validatorPretty{v.PubKey, v.Power} s[i] = validatorPretty{v.PubKey, v.Power}
} }
return string(wire.JSONBytes(s)) b, _ := json.Marshal(s)
return string(b)
} }