From 157ec8af2d6ea6d3182dc38cbab261be02e87eb8 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Fri, 12 May 2017 22:22:22 +0200 Subject: [PATCH 1/3] Add json tags to validator set --- types/validator_set.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/validator_set.go b/types/validator_set.go index f6a8faf4..7d019e02 100644 --- a/types/validator_set.go +++ b/types/validator_set.go @@ -6,9 +6,9 @@ import ( "sort" "strings" + "github.com/tendermint/go-wire" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/merkle" - "github.com/tendermint/go-wire" ) // ValidatorSet represent a set of *Validator at a given height. @@ -23,8 +23,8 @@ import ( // TODO: consider validator Accum overflow // TODO: move valset into an iavl tree where key is 'blockbonded|pubkey' type ValidatorSet struct { - Validators []*Validator // NOTE: persisted via reflect, must be exported. - Proposer *Validator + Validators []*Validator `json:"validators"` + Proposer *Validator `json:"proposer"` // cached (unexported) totalVotingPower int64 From 2b324b7eb9267387c198b6dc942bfc9b95b33f59 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Sat, 13 May 2017 11:33:35 +0200 Subject: [PATCH 2/3] RPC returns pretty formated json --- rpc/lib/server/handlers.go | 2 +- rpc/lib/server/http_server.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpc/lib/server/handlers.go b/rpc/lib/server/handlers.go index f35a5df8..5745f6fa 100644 --- a/rpc/lib/server/handlers.go +++ b/rpc/lib/server/handlers.go @@ -539,7 +539,7 @@ func (wsc *wsConnection) writeRoutine() { return } case msg := <-wsc.writeChan: - jsonBytes, err := json.Marshal(msg) + jsonBytes, err := json.MarshalIndent(msg, "", " ") if err != nil { wsc.Logger.Error("Failed to marshal RPCResponse to JSON", "error", err) } else { diff --git a/rpc/lib/server/http_server.go b/rpc/lib/server/http_server.go index 01b5b17d..3b856b5d 100644 --- a/rpc/lib/server/http_server.go +++ b/rpc/lib/server/http_server.go @@ -48,7 +48,7 @@ func StartHTTPServer(listenAddr string, handler http.Handler, logger log.Logger) } func WriteRPCResponseHTTPError(w http.ResponseWriter, httpCode int, res types.RPCResponse) { - jsonBytes, err := json.Marshal(res) + jsonBytes, err := json.MarshalIndent(res, "", " ") if err != nil { panic(err) } @@ -59,7 +59,7 @@ func WriteRPCResponseHTTPError(w http.ResponseWriter, httpCode int, res types.RP } func WriteRPCResponseHTTP(w http.ResponseWriter, res types.RPCResponse) { - jsonBytes, err := json.Marshal(res) + jsonBytes, err := json.MarshalIndent(res, "", " ") if err != nil { panic(err) } From 926fb83e33d9910f4a31704b42b070e462248874 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Sun, 14 May 2017 19:10:58 +0200 Subject: [PATCH 3/3] Re-added comment --- types/validator_set.go | 1 + 1 file changed, 1 insertion(+) diff --git a/types/validator_set.go b/types/validator_set.go index 7d019e02..214e073d 100644 --- a/types/validator_set.go +++ b/types/validator_set.go @@ -23,6 +23,7 @@ import ( // TODO: consider validator Accum overflow // TODO: move valset into an iavl tree where key is 'blockbonded|pubkey' type ValidatorSet struct { + // NOTE: persisted via reflect, must be exported. Validators []*Validator `json:"validators"` Proposer *Validator `json:"proposer"`