common: unify hex prefix check code (ethereum#19937)

lmittmann · fjl · commit 1cd5bf080ea8 · 2019-08-22T11:45:07.000+02:00
diff --git a/common/bytes.go b/common/bytes.go
@@ -43,10 +43,8 @@ func ToHexArray(b [][]byte) []string {
 // FromHex returns the bytes represented by the hexadecimal string s.
 // s may be prefixed with "0x".
 func FromHex(s string) []byte {
-	if len(s) > 1 {
-		if s[0:2] == "0x" || s[0:2] == "0X" {
-			s = s[2:]
-		}
+	if has0xPrefix(s) {
+		s = s[2:]
 	}
 	if len(s)%2 == 1 {
 		s = "0" + s
@@ -65,8 +63,8 @@ func CopyBytes(b []byte) (copiedBytes []byte) {
 	return
 }
 
-// hasHexPrefix validates str begins with '0x' or '0X'.
-func hasHexPrefix(str string) bool {
+// has0xPrefix validates str begins with '0x' or '0X'.
+func has0xPrefix(str string) bool {
 	return len(str) >= 2 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X')
 }
 
diff --git a/common/types.go b/common/types.go
@@ -193,7 +193,7 @@ func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) }
 // IsHexAddress verifies whether a string can represent a valid hex-encoded
 // Ethereum address or not.
 func IsHexAddress(s string) bool {
-	if hasHexPrefix(s) {
+	if has0xPrefix(s) {
 		s = s[2:]
 	}
 	return len(s) == 2*AddressLength && isHex(s)

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) }`
`193`	`193`	`// IsHexAddress verifies whether a string can represent a valid hex-encoded`
`194`	`194`	`// Ethereum address or not.`
`195`	`195`	`func IsHexAddress(s string) bool {`
`196`		`- if hasHexPrefix(s) {`
	`196`	`+ if has0xPrefix(s) {`
`197`	`197`	`s = s[2:]`
`198`	`198`	`}`
`199`	`199`	`return len(s) == 2*AddressLength && isHex(s)`