refactor: replace HasPrefix+TrimPrefix with CutPrefix

Signed-off-by: ledigang <[email protected]>

Author: ledigang

cmd/retest/retest.go

@@ -279,8 +279,7 @@ func processNumericString(s string) *big.Int {
 	if strings.Contains(s, ":") {
 		log.Fatal().Str("string", s).Msg("Unknown number format")
 	}
-	if strings.HasPrefix(s, "0x") {
-		s = strings.TrimPrefix(s, "0x")
+	if s, ok := strings.CutPrefix(s, "0x"); ok {
 		num, fullRead := new(big.Int).SetString(s, 16)
 		if !fullRead {
 			log.Fatal().Str("input", s).Msg("Unable to read the full hex data?!")
@@ -585,8 +584,7 @@ func rawArgsToStrings(rawArgs string, params []string) []string {
 	processedArgs := make([]string, count)
 	for k, arg := range argList {
 		if strings.HasPrefix(params[k], "uint") {
-			if strings.HasPrefix(arg, "0x") {
-				arg = strings.TrimPrefix(arg, "0x")
+			if arg, ok := strings.CutPrefix(arg, "0x"); ok {
 				if len(arg) > 64 {
 					// i think this is a bug but there is a test case that's somehow longer than 32 bytes
 					// https://github.com/ethereum/tests/blob/fd26aad70e24f042fcd135b2f0338b1c6bf1a324/src/GeneralStateTestsFiller/Cancun/stEIP1153-transientStorage/transStorageOKFiller.yml#L801

util/util.go

@@ -431,8 +431,7 @@ func GetHexString(data any) string {
 	if reflect.TypeOf(data).Kind() == reflect.Float64 {
 		result = fmt.Sprintf("%x", int64(data.(float64)))
 	} else if reflect.TypeOf(data).Kind() == reflect.String {
-		if strings.HasPrefix(data.(string), "0x") {
-			result = strings.TrimPrefix(data.(string), "0x")
+		if result, ok := strings.CutPrefix(data.(string), "0x"); ok {
 		} else {
 			result = data.(string)
 		}