roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #3570 from fjl/hexutil-zero-fix

Browse Source 
common/hexutil: fix EncodeBig, Big.MarshalJSON
This commit is contained in:
Péter Szilágyi 2017-01-16 11:49:18 +02:00 committed by GitHub
commit 2a1a531ba3
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/hexutil/hexutil.go
View File

@ -169,12 +169,7 @@ func EncodeBig(bigint *big.Int) string {
if nbits == 0 { if nbits == 0 {
return "0x0" return "0x0"
} }
enc := make([]byte, 2, (nbits/8)*2+2) return fmt.Sprintf("0x%x", bigint)
copy(enc, "0x")
for i := len(bigint.Bits()) - 1; i >= 0; i-- {
enc = strconv.AppendUint(enc, uint64(bigint.Bits()[i]), 16)
}
return string(enc)
} }
func has0xPrefix(input string) bool { func has0xPrefix(input string) bool {

1
common/hexutil/hexutil_test.go
View File

@ -46,6 +46,7 @@ var (
{referenceBig("1"), "0x1"}, {referenceBig("1"), "0x1"},
{referenceBig("ff"), "0xff"}, {referenceBig("ff"), "0xff"},
{referenceBig("112233445566778899aabbccddeeff"), "0x112233445566778899aabbccddeeff"}, {referenceBig("112233445566778899aabbccddeeff"), "0x112233445566778899aabbccddeeff"},
{referenceBig("80a7f2c1bcc396c00"), "0x80a7f2c1bcc396c00"},
} }
encodeUint64Tests = []marshalTest{ encodeUint64Tests = []marshalTest{

9
common/hexutil/json.go
View File

@ -109,13 +109,8 @@ func (b *Big) MarshalJSON() ([]byte, error) {
if nbits == 0 { if nbits == 0 {
return jsonZero, nil return jsonZero, nil
} }
enc := make([]byte, 3, (nbits/8)*2+4) enc := fmt.Sprintf(`"0x%x"`, bigint)
copy(enc, `"0x`) return []byte(enc), nil
for i := len(bigint.Bits()) - 1; i >= 0; i-- {
enc = strconv.AppendUint(enc, uint64(bigint.Bits()[i]), 16)
}
enc = append(enc, '"')
return enc, nil
} }
// UnmarshalJSON implements json.Unmarshaler. // UnmarshalJSON implements json.Unmarshaler.