Commit e55bfc7a authored by Kostas Christidis's avatar Kostas Christidis Committed by Gerrit Code Review
Browse files

Merge "[FAB-5443] Have configtxlator emit default fields"

parents 1c35dc2b 82c6675f
......@@ -45,7 +45,7 @@ var (
},
}
testOutput = `{"data":{"data":[{"signature":"YmFy"}]},"header":{"previous_hash":"Zm9v"}}`
testOutput = `{"data":{"data":[{"signature":"YmFy"}]},"header":{"number":"0","previous_hash":"Zm9v"}}`
)
func TestProtolatorDecode(t *testing.T) {
......
......@@ -216,8 +216,8 @@ func protoToJSON(msg proto.Message) ([]byte, error) {
var b bytes.Buffer
m := jsonpb.Marshaler{
EnumsAsInts: false,
EmitDefaults: false,
Indent: " ",
EmitDefaults: true,
Indent: " ",
OrigName: true,
}
err := m.Marshal(&b, msg)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment