common/hexutil: fix EncodeBig, Big.MarshalJSON

fjl · fjl · commit 51f6b6d33f5b · 2017-01-16T10:32:40.000+01:00
The code was too clever and failed to include zeros on a big.Word
boundary.
diff --git a/common/hexutil/hexutil.go b/common/hexutil/hexutil.go
@@ -169,12 +169,7 @@ func EncodeBig(bigint *big.Int) string {
 	if nbits == 0 {
 		return "0x0"
 	}
-	enc := make([]byte, 2, (nbits/8)*2+2)
-	copy(enc, "0x")
-	for i := len(bigint.Bits()) - 1; i >= 0; i-- {
-		enc = strconv.AppendUint(enc, uint64(bigint.Bits()[i]), 16)
-	}
-	return string(enc)
+	return fmt.Sprintf("0x%x", bigint)
 }
 
 func has0xPrefix(input string) bool {
diff --git a/common/hexutil/hexutil_test.go b/common/hexutil/hexutil_test.go
@@ -46,6 +46,7 @@ var (
 		{referenceBig("1"), "0x1"},
 		{referenceBig("ff"), "0xff"},
 		{referenceBig("112233445566778899aabbccddeeff"), "0x112233445566778899aabbccddeeff"},
+		{referenceBig("80a7f2c1bcc396c00"), "0x80a7f2c1bcc396c00"},
 	}
 
 	encodeUint64Tests = []marshalTest{
diff --git a/common/hexutil/json.go b/common/hexutil/json.go
@@ -109,13 +109,8 @@ func (b *Big) MarshalJSON() ([]byte, error) {
 	if nbits == 0 {
 		return jsonZero, nil
 	}
-	enc := make([]byte, 3, (nbits/8)*2+4)
-	copy(enc, `"0x`)
-	for i := len(bigint.Bits()) - 1; i >= 0; i-- {
-		enc = strconv.AppendUint(enc, uint64(bigint.Bits()[i]), 16)
-	}
-	enc = append(enc, '"')
-	return enc, nil
+	enc := fmt.Sprintf(`"0x%x"`, bigint)
+	return []byte(enc), nil
 }
 
 // UnmarshalJSON implements json.Unmarshaler.

Original file line number	Diff line number	Diff line change
`@@ -169,12 +169,7 @@ func EncodeBig(bigint *big.Int) string {`
`169`	`169`	`if nbits == 0 {`
`170`	`170`	`return "0x0"`
`171`	`171`	`}`
`172`		`- enc := make([]byte, 2, (nbits/8)*2+2)`
`173`		`- copy(enc, "0x")`
`174`		`- for i := len(bigint.Bits()) - 1; i >= 0; i-- {`
`175`		`- enc = strconv.AppendUint(enc, uint64(bigint.Bits()[i]), 16)`
`176`		`- }`
`177`		`- return string(enc)`
	`172`	`+ return fmt.Sprintf("0x%x", bigint)`
`178`	`173`	`}`
`179`	`174`
`180`	`175`	`func has0xPrefix(input string) bool {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ var (`
`46`	`46`	`{referenceBig("1"), "0x1"},`
`47`	`47`	`{referenceBig("ff"), "0xff"},`
`48`	`48`	`{referenceBig("112233445566778899aabbccddeeff"), "0x112233445566778899aabbccddeeff"},`
	`49`	`+ {referenceBig("80a7f2c1bcc396c00"), "0x80a7f2c1bcc396c00"},`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`encodeUint64Tests = []marshalTest{`