Replace byte arrays with hex encoding for json

README.md

@@ -32,7 +32,7 @@ type Message struct {
 ```
 
 #### Partial Signature Message
-Used for pre and post consensus sigantures for collecting partial BN signatures and then reconstructing them
+Used for pre and post consensus signatures for collecting partial BN signatures and then reconstructing them
 ```go
 type PartialSignatureMessage struct {
     Type             PartialSigMsgType

qbft/json_testutils.go

@@ -2,7 +2,9 @@ package qbft
 
 import (
 	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
+	"strings"
 
 	"github.com/pkg/errors"
 )
@@ -39,6 +41,18 @@ func (c *Controller) GetRoot() ([32]byte, error) {
 	return ret, nil
 }
 
+// UnmarshalJSON is a custom JSON unmarshaller for Controller
+func (c *Controller) UnmarshalJSON(data []byte) error {
+	type ControllerAlias Controller
+	aux := &struct {
+		*ControllerAlias
+	}{
+		ControllerAlias: (*ControllerAlias)(c),
+	}
+
+	return json.Unmarshal(data, aux)
+}
+
 // Instance
 func (i *Instance) Encode() ([]byte, error) {
 	return json.Marshal(i)
@@ -126,3 +140,68 @@ func (c *MsgContainer) GetRoot() ([32]byte, error) {
 	ret := sha256.Sum256(marshaledRoot)
 	return ret, nil
 }
+
+// Message
+func (m *Message) MarshalJSON() ([]byte, error) {
+	return json.Marshal(map[string]interface{}{
+		"MsgType":                  m.MsgType,
+		"Height":                   m.Height,
+		"Round":                    m.Round,
+		"Identifier":               m.Identifier,
+		"Root":                     hex.EncodeToString(m.Root[:]),
+		"DataRound":                m.DataRound,
+		"RoundChangeJustification": m.RoundChangeJustification,
+		"PrepareJustification":     m.PrepareJustification,
+	})
+}
+
+func (m *Message) UnmarshalJSON(data []byte) error {
+	type Alias Message
+	aux := &struct {
+		Root string `json:"Root"`
+		*Alias
+	}{
+		Alias: (*Alias)(m),
+	}
+
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	if aux.Root != "" {
+		if bytes, err := hex.DecodeString(aux.Root); err == nil {
+			if len(bytes) != 32 {
+				return errors.New("Root must be exactly 32 bytes")
+			}
+			copy(m.Root[:], bytes)
+			return nil
+		}
+	}
+
+	return nil
+}
+
+// Value type for hex encoding json
+
+type Value [32]byte
+
+func (r *Value) MarshalJSON() ([]byte, error) {
+	return json.Marshal(hex.EncodeToString(r[:]))
+}
+
+func (r *Value) UnmarshalJSON(data []byte) error {
+	hexStr := hexStringFromJSON(data)
+	bytes, err := hex.DecodeString(hexStr)
+	if err != nil {
+		return errors.Wrap(err, "failed to decode Value")
+	}
+	copy(r[:], bytes)
+	return nil
+}
+
+// helpers
+
+// hexStringFromJSON trims surrounding quotes from a JSON string value.
+func hexStringFromJSON(data []byte) string {
+	return strings.TrimSuffix(strings.TrimPrefix(string(data), "\""), "\"")
+}

qbft/spectest/generate/main.go

@@ -100,7 +100,7 @@ func writeJsonStateComparison(name, testType string, post interface{}) {
 	}
 	log.Printf("writing state comparison json: %s\n", name)
 
-	byts, err := json.MarshalIndent(post, "", "		")
+	byts, err := json.MarshalIndent(post, "", "  ")
 	if err != nil {
 		panic(err.Error())
 	}