Merge pull request #2100 from OpenBazaar/brian.fixChecksum

cpacia · web-flow · commit a8ed17a188ef · 2020-09-18T11:54:14.000-04:00
Do not strip 0x in the middle of the string
diff --git a/util/utils.go b/util/utils.go
@@ -65,7 +65,7 @@ const EmojiPattern = "[\\x{2712}\\x{2714}\\x{2716}\\x{271d}\\x{2721}\\x{2728}\\x
 
 // NormalizeAddress is used to strip the 0x prefix
 func NormalizeAddress(addr string) string {
-	return strings.Replace(addr, "0x", "", 1)
+	return strings.TrimPrefix(addr, "0x")
 }
 
 // AreAddressesEqual - check if addresses are equal after normalizing them

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ const EmojiPattern = "[\\x{2712}\\x{2714}\\x{2716}\\x{271d}\\x{2721}\\x{2728}\\x`
`65`	`65`
`66`	`66`	`// NormalizeAddress is used to strip the 0x prefix`
`67`	`67`	`func NormalizeAddress(addr string) string {`
`68`		`- return strings.Replace(addr, "0x", "", 1)`
	`68`	`+ return strings.TrimPrefix(addr, "0x")`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// AreAddressesEqual - check if addresses are equal after normalizing them`