tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: replace some cases of strings.SplitN with strings.Cut (#28446)

Browse Source
This commit is contained in:
Håvard Anda Estensen 2023-11-15 16:42:33 +03:00 committed by GitHub
parent db7895d3b6
commit a75a2d6db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/scwallet/wallet.go
View File

@ -776,16 +776,16 @@ func (w *Wallet) findAccountPath(account accounts.Account) (accounts.DerivationP
return nil, fmt.Errorf("scheme %s does not match wallet scheme %s", account.URL.Scheme, w.Hub.scheme) return nil, fmt.Errorf("scheme %s does not match wallet scheme %s", account.URL.Scheme, w.Hub.scheme)
} }
parts := strings.SplitN(account.URL.Path, "/", 2) url, path, found := strings.Cut(account.URL.Path, "/")
if len(parts) != 2 { if !found {
return nil, fmt.Errorf("invalid URL format: %s", account.URL) return nil, fmt.Errorf("invalid URL format: %s", account.URL)
} }
if parts[0] != fmt.Sprintf("%x", w.PublicKey[1:3]) { if url != fmt.Sprintf("%x", w.PublicKey[1:3]) {
return nil, fmt.Errorf("URL %s is not for this wallet", account.URL) return nil, fmt.Errorf("URL %s is not for this wallet", account.URL)
} }
return accounts.ParseDerivationPath(parts[1]) return accounts.ParseDerivationPath(path)
} }
// Session represents a secured communication session with the wallet. // Session represents a secured communication session with the wallet.

4
cmd/p2psim/main.go
View File

@ -417,9 +417,7 @@ func rpcNode(ctx *cli.Context) error {
} }
func rpcSubscribe(client *rpc.Client, out io.Writer, method string, args ...string) error { func rpcSubscribe(client *rpc.Client, out io.Writer, method string, args ...string) error {
parts := strings.SplitN(method, "_", 2) namespace, method, _ := strings.Cut(method, "_")
namespace := parts[0]
method = parts[1]
ch := make(chan interface{}) ch := make(chan interface{})
subArgs := make([]interface{}, len(args)+1) subArgs := make([]interface{}, len(args)+1)
subArgs[0] = method subArgs[0] = method

12
p2p/nat/nat.go
View File

@ -61,12 +61,12 @@ type Interface interface {
// "pmp:192.168.0.1" uses NAT-PMP with the given gateway address // "pmp:192.168.0.1" uses NAT-PMP with the given gateway address
func Parse(spec string) (Interface, error) { func Parse(spec string) (Interface, error) {
var ( var (
parts = strings.SplitN(spec, ":", 2) before, after, found = strings.Cut(spec, ":")
mech = strings.ToLower(parts[0]) mech = strings.ToLower(before)
ip net.IP ip net.IP
) )
if len(parts) > 1 { if found {
ip = net.ParseIP(parts[1]) ip = net.ParseIP(after)
if ip == nil { if ip == nil {
return nil, errors.New("invalid IP address") return nil, errors.New("invalid IP address")
} }
@ -86,7 +86,7 @@ func Parse(spec string) (Interface, error) {
case "pmp", "natpmp", "nat-pmp": case "pmp", "natpmp", "nat-pmp":
return PMP(ip), nil return PMP(ip), nil
default: default:
return nil, fmt.Errorf("unknown mechanism %q", parts[0]) return nil, fmt.Errorf("unknown mechanism %q", before)
} }
} }

8
p2p/simulations/http.go
View File

@ -479,12 +479,12 @@ func (s *Server) StreamNetworkEvents(w http.ResponseWriter, req *http.Request) {
func NewMsgFilters(filterParam string) (MsgFilters, error) { func NewMsgFilters(filterParam string) (MsgFilters, error) {
filters := make(MsgFilters) filters := make(MsgFilters)
for _, filter := range strings.Split(filterParam, "-") { for _, filter := range strings.Split(filterParam, "-") {
protoCodes := strings.SplitN(filter, ":", 2) proto, codes, found := strings.Cut(filter, ":")
if len(protoCodes) != 2 || protoCodes[0] == "" || protoCodes[1] == "" { if !found || proto == "" || codes == "" {
return nil, fmt.Errorf("invalid message filter: %s", filter) return nil, fmt.Errorf("invalid message filter: %s", filter)
} }
proto := protoCodes[0]
for _, code := range strings.Split(protoCodes[1], ",") { for _, code := range strings.Split(codes, ",") {
if code == "*" || code == "-1" { if code == "*" || code == "-1" {
filters[MsgFilter{Proto: proto, Code: -1}] = struct{}{} filters[MsgFilter{Proto: proto, Code: -1}] = struct{}{}
continue continue

4
rpc/json.go
View File

@ -86,8 +86,8 @@ func (msg *jsonrpcMessage) isUnsubscribe() bool {
} }
func (msg *jsonrpcMessage) namespace() string { func (msg *jsonrpcMessage) namespace() string {
elem := strings.SplitN(msg.Method, serviceMethodSeparator, 2) before, _, _ := strings.Cut(msg.Method, serviceMethodSeparator)
return elem[0] return before
} }
func (msg *jsonrpcMessage) String() string { func (msg *jsonrpcMessage) String() string {

6
rpc/service.go
View File

@ -93,13 +93,13 @@ func (r *serviceRegistry) registerName(name string, rcvr interface{}) error {
// callback returns the callback corresponding to the given RPC method name. // callback returns the callback corresponding to the given RPC method name.
func (r *serviceRegistry) callback(method string) *callback { func (r *serviceRegistry) callback(method string) *callback {
elem := strings.SplitN(method, serviceMethodSeparator, 2) before, after, found := strings.Cut(method, serviceMethodSeparator)
if len(elem) != 2 { if !found {
return nil return nil
} }
r.mu.Lock() r.mu.Lock()
defer r.mu.Unlock() defer r.mu.Unlock()
return r.services[elem[0]].callbacks[elem[1]] return r.services[before].callbacks[after]
} }
// subscription returns a subscription callback in the given service. // subscription returns a subscription callback in the given service.