From 2bb538b150f197a04a0b969a27e9ea24d35edbc1 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 2 Jan 2018 11:05:53 -0500
Subject: [PATCH] cmn: fix HexBytes.MarshalJSON

---
 common/bytes.go      | 2 +-
 common/bytes_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/bytes.go b/common/bytes.go
index 1ec880c25..ba81bbe97 100644
--- a/common/bytes.go
+++ b/common/bytes.go
@@ -26,7 +26,7 @@ func (bz HexBytes) MarshalJSON() ([]byte, error) {
 	jbz := make([]byte, len(s)+2)
 	jbz[0] = '"'
 	copy(jbz[1:], []byte(s))
-	jbz[1] = '"'
+	jbz[len(jbz)-1] = '"'
 	return jbz, nil
 }
 
diff --git a/common/bytes_test.go b/common/bytes_test.go
index 3e693b239..9e11988f2 100644
--- a/common/bytes_test.go
+++ b/common/bytes_test.go
@@ -35,8 +35,8 @@ func TestJSONMarshal(t *testing.T) {
 		expected string
 	}{
 		{[]byte(``), `{"B1":"","B2":""}`},
-		{[]byte(``), `{"B1":"","B2":""}`},
-		{[]byte(``), `{"B1":"","B2":""}`},
+		{[]byte(`a`), `{"B1":"YQ==","B2":"61"}`},
+		{[]byte(`abc`), `{"B1":"YWJj","B2":"616263"}`},
 	}
 
 	for i, tc := range cases {