Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions accounts/scwallet/wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

parts := strings.SplitN(account.URL.Path, "/", 2)
if len(parts) != 2 {
url, path, found := strings.Cut(account.URL.Path, "/")
if !found {
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 accounts.ParseDerivationPath(parts[1])
return accounts.ParseDerivationPath(path)
}

// Session represents a secured communication session with the wallet.
Expand Down
12 changes: 6 additions & 6 deletions p2p/nat/nat.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ type Interface interface {
// "pmp:192.168.0.1" uses NAT-PMP with the given gateway address
func Parse(spec string) (Interface, error) {
var (
parts = strings.SplitN(spec, ":", 2)
mech = strings.ToLower(parts[0])
ip net.IP
before, after, found = strings.Cut(spec, ":")
mech = strings.ToLower(before)
ip net.IP
)
if len(parts) > 1 {
ip = net.ParseIP(parts[1])
if found {
ip = net.ParseIP(after)
if ip == nil {
return nil, errors.New("invalid IP address")
}
Expand All @@ -86,7 +86,7 @@ func Parse(spec string) (Interface, error) {
case "pmp", "natpmp", "nat-pmp":
return PMP(ip), nil
default:
return nil, fmt.Errorf("unknown mechanism %q", parts[0])
return nil, fmt.Errorf("unknown mechanism %q", before)
}
}

Expand Down
8 changes: 4 additions & 4 deletions p2p/simulations/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,12 +478,12 @@ func (s *Server) StreamNetworkEvents(w http.ResponseWriter, req *http.Request) {
func NewMsgFilters(filterParam string) (MsgFilters, error) {
filters := make(MsgFilters)
for _, filter := range strings.Split(filterParam, "-") {
protoCodes := strings.SplitN(filter, ":", 2)
if len(protoCodes) != 2 || protoCodes[0] == "" || protoCodes[1] == "" {
proto, codes, found := strings.Cut(filter, ":")
if !found || proto == "" || codes == "" {
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" {
filters[MsgFilter{Proto: proto, Code: -1}] = struct{}{}
continue
Expand Down
8 changes: 4 additions & 4 deletions rpc/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ func (msg *jsonrpcMessage) isUnsubscribe() bool {
}

func (msg *jsonrpcMessage) namespace() string {
elem := strings.SplitN(msg.Method, serviceMethodSeparator, 2)
if elem[0] == "eth" {
elem[0] = "ctxc"
before, _, _ := strings.Cut(msg.Method, serviceMethodSeparator)
if before == "eth" {
before = "ctxc"
}
return elem[0]
return before
}

func (msg *jsonrpcMessage) String() string {
Expand Down
10 changes: 5 additions & 5 deletions rpc/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ func (r *serviceRegistry) registerName(name string, rcvr interface{}) error {

// callback returns the callback corresponding to the given RPC method name.
func (r *serviceRegistry) callback(method string) *callback {
elems := strings.SplitN(method, serviceMethodSeparator, 2)
if len(elems) != 2 {
before, after, found := strings.Cut(method, serviceMethodSeparator)
if !found {
return nil
}
if elems[0] == "eth" {
elems[0] = "ctxc"
if before == "eth" {
before = "ctxc"
}
r.mu.Lock()
defer r.mu.Unlock()
return r.services[elems[0]].callbacks[elems[1]]
return r.services[before].callbacks[after]
}

// subscription returns a subscription callback in the given service.
Expand Down