Skip to content

rpc: implement Unwrap() for wsHandshakeError #29522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2024
Merged

rpc: implement Unwrap() for wsHandshakeError #29522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
990e12c
implement unwrap for wsHandshakeError & remove tautological condition
sucramx Apr 12, 2024
bc5f9ab
Merge branch 'ethereum:master' into implement-unwrap
sucramx Apr 15, 2024
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
2 changes: 1 addition & 1 deletion rpc/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ func (c *Client) BatchCallContext(ctx context.Context, b []BatchElem) error {
}

// Wait for all responses to come back.
for n := 0; n < len(batchresp) && err == nil; n++ {
for n := 0; n < len(batchresp); n++ {
resp := batchresp[n]
if resp == nil {
// Ignore null responses. These can happen for batches sent via HTTP.
Expand Down
4 changes: 4 additions & 0 deletions rpc/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ func (e wsHandshakeError) Error() string {
return s
}

func (e wsHandshakeError) Unwrap() error {
return e.err
}

func originIsAllowed(allowedOrigins mapset.Set[string], browserOrigin string) bool {
it := allowedOrigins.Iterator()
for origin := range it.C {
Expand Down