Merge PR #4678: Clean YAML output

x/simulation/log.go

@@ -23,7 +23,7 @@ func NewLogWriter(testingmode bool) LogWriter {
 
 // log writter
 type StandardLogWriter struct {
-	OpEntries []OperationEntry `json:"op_entries"`
+	OpEntries []OperationEntry `json:"op_entries" yaml:"op_entries"`
 }
 
 // add an entry to the log writter

x/simulation/operation.go

@@ -34,10 +34,10 @@ const (
 
 // OperationEntry - an operation entry for logging (ex. BeginBlock, EndBlock, XxxMsg, etc)
 type OperationEntry struct {
-	EntryKind string          `json:"entry_kind"`
-	Height    int64           `json:"height"`
-	Order     int64           `json:"order"`
-	Operation json.RawMessage `json:"operation"`
+	EntryKind string          `json:"entry_kind" yaml:"entry_kind"`
+	Height    int64           `json:"height" yaml:"height"`
+	Order     int64           `json:"order" yaml:"order"`
+	Operation json.RawMessage `json:"operation" yaml:"operation"`
 }
 
 // BeginBlockEntry - operation entry for begin block
@@ -93,11 +93,11 @@ func (oe OperationEntry) MustMarshal() json.RawMessage {
 
 // OperationMsg - structure for operation output
 type OperationMsg struct {
-	Route   string          `json:"route"`
-	Name    string          `json:"name"`
-	Comment string          `json:"comment"`
-	OK      bool            `json:"ok"`
-	Msg     json.RawMessage `json:"msg"`
+	Route   string          `json:"route" yaml:"route"`
+	Name    string          `json:"name" yaml:"name"`
+	Comment string          `json:"comment" yaml:"comment"`
+	OK      bool            `json:"ok" yaml:"ok"`
+	Msg     json.RawMessage `json:"msg" yaml:"msg"`
 }
 
 // OperationMsg - create a new operation message from sdk.Msg