forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use hasHexPrefix for 0x prefix check

Browse source
This commit is contained in:
lmittmann 2019-08-15 12:40:58 +02:00
parent d9258162ca
commit 5b2834856e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/bytes.go
View file

@ -43,11 +43,9 @@ func ToHexArray(b [][]byte) []string {
// FromHex returns the bytes represented by the hexadecimal string s. // FromHex returns the bytes represented by the hexadecimal string s.
// s may be prefixed with "0x". // s may be prefixed with "0x".
func FromHex(s string) []byte { func FromHex(s string) []byte {
if len(s) > 1 { if hasHexPrefix(s) {
if s[0:2] == "0x" || s[0:2] == "0X" {
s = s[2:] s = s[2:]
} }
}
if len(s)%2 == 1 { if len(s)%2 == 1 {
s = "0" + s s = "0" + s
} }