diff options
Diffstat (limited to 'common/bytes.go')
| -rw-r--r-- | common/bytes.go | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/common/bytes.go b/common/bytes.go index 66577bbfd..ba00e8a4b 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -17,9 +17,7 @@ // Package common contains various helper functions. package common -import ( - "encoding/hex" -) +import "encoding/hex" func ToHex(b []byte) string { hex := Bytes2Hex(b) @@ -35,12 +33,11 @@ func FromHex(s string) []byte { if s[0:2] == "0x" || s[0:2] == "0X" { s = s[2:] } - if len(s)%2 == 1 { - s = "0" + s - } - return Hex2Bytes(s) } - return nil + if len(s)%2 == 1 { + s = "0" + s + } + return Hex2Bytes(s) } // Copy bytes @@ -56,14 +53,24 @@ func CopyBytes(b []byte) (copiedBytes []byte) { return } -func HasHexPrefix(str string) bool { - l := len(str) - return l >= 2 && str[0:2] == "0x" +func hasHexPrefix(str string) bool { + return len(str) >= 2 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X') +} + +func isHexCharacter(c byte) bool { + return ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F') } -func IsHex(str string) bool { - l := len(str) - return l >= 4 && l%2 == 0 && str[0:2] == "0x" +func isHex(str string) bool { + if len(str)%2 != 0 { + return false + } + for _, c := range []byte(str) { + if !isHexCharacter(c) { + return false + } + } + return true } func Bytes2Hex(d []byte) string { |