fix: implement Unwrap for wsHandshakeError and remove tautological loop condition (ethereum#29522) - #129
Merged
Conversation
(cherry picked from commit e4ecaf89cf5ee6233094f738c4978020fe63e237)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Ports ethereum#29522. Adds
Unwrap()towsHandshakeErrorso the underlying error is reachable viaerrors.Is()/errors.As(). Also removes a tautologicalerr == nilcondition from theBatchCallContextloop, whereerris never modified inside the loop body.Upstream References
Changes
rpc/websocket.go: addfunc (e wsHandshakeError) Unwrap() error { return e.err }to expose the wrapped error through the standard error chainrpc/client.go: remove&& err == nilfromBatchCallContextloop condition —erris never assigned inside the loop, making the condition always true