From 0a0b92efa707207a71ed7e2818616567b1387075 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Wed, 29 Oct 2025 11:24:12 +0800 Subject: [PATCH] all: replace strings.Split with more efficient strings.SplitSeq --- cmd/XDC/config.go | 2 +- cmd/utils/flags.go | 2 +- eth/backend.go | 2 +- internal/build/util.go | 2 +- log/handler_glog.go | 4 ++-- node/api.go | 10 +++++----- p2p/simulations/http.go | 4 ++-- rlp/internal/rlpstruct/rlpstruct.go | 2 +- rpc/server_test.go | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/XDC/config.go b/cmd/XDC/config.go index c151fdf6348c..e479db0bb4d7 100644 --- a/cmd/XDC/config.go +++ b/cmd/XDC/config.go @@ -175,7 +175,7 @@ func loadBaseConfig(ctx *cli.Context) XDCConfig { for _, env := range cfg.Account.Passwords { if trimmed := strings.TrimSpace(env); trimmed != "" { value := os.Getenv(trimmed) - for _, info := range strings.Split(value, ",") { + for info := range strings.SplitSeq(value, ",") { if trimmed2 := strings.TrimSpace(info); trimmed2 != "" { passwords = append(passwords, trimmed2) } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 162e0c523127..ae1ca1b01af9 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1897,7 +1897,7 @@ func MakeConsolePreloads(ctx *cli.Context) []string { preloads := []string{} assets := ctx.String(JSpathFlag.Name) - for _, file := range strings.Split(ctx.String(PreloadJSFlag.Name), ",") { + for file := range strings.SplitSeq(ctx.String(PreloadJSFlag.Name), ",") { preloads = append(preloads, common.AbsolutePath(assets, strings.TrimSpace(file))) } return preloads diff --git a/eth/backend.go b/eth/backend.go index ae7aee523ae2..fc88f15d718d 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -129,7 +129,7 @@ func New(stack *node.Node, config *ethconfig.Config, XDCXServ *XDCx.XDCX, lendin common.CopyConstants(networkID) log.Info(strings.Repeat("-", 153)) - for _, line := range strings.Split(chainConfig.Description(), "\n") { + for line := range strings.SplitSeq(chainConfig.Description(), "\n") { log.Info(line) } log.Info(strings.Repeat("-", 153)) diff --git a/internal/build/util.go b/internal/build/util.go index 7334f409dd32..f889383bbe3c 100644 --- a/internal/build/util.go +++ b/internal/build/util.go @@ -151,7 +151,7 @@ func ExpandPackages(patterns []string, quick bool) []string { log.Fatalf("package listing failed: %v\n%s", err, string(out)) } var packages []string - for _, line := range strings.Split(string(out), "\n") { + for line := range strings.SplitSeq(string(out), "\n") { if strings.Contains(line, "/vendor/") { continue } diff --git a/log/handler_glog.go b/log/handler_glog.go index 739f8c5b427d..021d507c0529 100644 --- a/log/handler_glog.go +++ b/log/handler_glog.go @@ -86,7 +86,7 @@ func (h *GlogHandler) Verbosity(level slog.Level) { // sets V to 3 in all files of any packages whose import path contains "foo" func (h *GlogHandler) Vmodule(ruleset string) error { var filter []pattern - for _, rule := range strings.Split(ruleset, ",") { + for rule := range strings.SplitSeq(ruleset, ",") { // Empty strings such as from a trailing comma can be ignored if len(rule) == 0 { continue @@ -113,7 +113,7 @@ func (h *GlogHandler) Vmodule(ruleset string) error { } // Compile the rule pattern into a regular expression matcher := ".*" - for _, comp := range strings.Split(parts[0], "/") { + for comp := range strings.SplitSeq(parts[0], "/") { if comp == "*" { matcher += "(/.*)?" } else if comp != "" { diff --git a/node/api.go b/node/api.go index e944bec1b37b..f081fa8a54f2 100644 --- a/node/api.go +++ b/node/api.go @@ -205,19 +205,19 @@ func (api *adminAPI) StartHTTP(host *string, port *int, cors *string, apis *stri } if cors != nil { config.CorsAllowedOrigins = nil - for _, origin := range strings.Split(*cors, ",") { + for origin := range strings.SplitSeq(*cors, ",") { config.CorsAllowedOrigins = append(config.CorsAllowedOrigins, strings.TrimSpace(origin)) } } if vhosts != nil { config.Vhosts = nil - for _, vhost := range strings.Split(*host, ",") { + for vhost := range strings.SplitSeq(*host, ",") { config.Vhosts = append(config.Vhosts, strings.TrimSpace(vhost)) } } if apis != nil { config.Modules = nil - for _, m := range strings.Split(*apis, ",") { + for m := range strings.SplitSeq(*apis, ",") { config.Modules = append(config.Modules, strings.TrimSpace(m)) } } @@ -283,13 +283,13 @@ func (api *adminAPI) StartWS(host *string, port *int, allowedOrigins *string, ap if apis != nil { config.Modules = nil - for _, m := range strings.Split(*apis, ",") { + for m := range strings.SplitSeq(*apis, ",") { config.Modules = append(config.Modules, strings.TrimSpace(m)) } } if allowedOrigins != nil { config.Origins = nil - for _, origin := range strings.Split(*allowedOrigins, ",") { + for origin := range strings.SplitSeq(*allowedOrigins, ",") { config.Origins = append(config.Origins, strings.TrimSpace(origin)) } } diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 3acd8bb79b54..501737cde453 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -480,13 +480,13 @@ func (s *Server) StreamNetworkEvents(w http.ResponseWriter, req *http.Request) { // A message code of '*' or '-1' is considered a wildcard and matches any code. func NewMsgFilters(filterParam string) (MsgFilters, error) { filters := make(MsgFilters) - for _, filter := range strings.Split(filterParam, "-") { + for filter := range strings.SplitSeq(filterParam, "-") { proto, codes, found := strings.Cut(filter, ":") if !found || proto == "" || codes == "" { return nil, fmt.Errorf("invalid message filter: %s", filter) } - for _, code := range strings.Split(codes, ",") { + for code := range strings.SplitSeq(codes, ",") { if code == "*" || code == "-1" { filters[MsgFilter{Proto: proto, Code: -1}] = struct{}{} continue diff --git a/rlp/internal/rlpstruct/rlpstruct.go b/rlp/internal/rlpstruct/rlpstruct.go index 2e3eeb688193..84c3e199a098 100644 --- a/rlp/internal/rlpstruct/rlpstruct.go +++ b/rlp/internal/rlpstruct/rlpstruct.go @@ -148,7 +148,7 @@ func parseTag(field Field, lastPublic int) (Tags, error) { name := field.Name tag := reflect.StructTag(field.Tag) var ts Tags - for _, t := range strings.Split(tag.Get("rlp"), ",") { + for t := range strings.SplitSeq(tag.Get("rlp"), ",") { switch t = strings.TrimSpace(t); t { case "": // empty tag is allowed for some reason diff --git a/rpc/server_test.go b/rpc/server_test.go index a38a64b080fd..41b5a6c44017 100644 --- a/rpc/server_test.go +++ b/rpc/server_test.go @@ -92,7 +92,7 @@ func runTestScript(t *testing.T, file string) { defer clientConn.Close() go server.ServeCodec(NewCodec(serverConn), 0) readbuf := bufio.NewReader(clientConn) - for _, line := range strings.Split(string(content), "\n") { + for line := range strings.SplitSeq(string(content), "\n") { line = strings.TrimSpace(line) switch { case len(line) == 0 || strings.HasPrefix(line, "//"):