p2p: preserve enode.ID type in the metered connection #17933
Merged
Conversation
This file contains 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
fjl
requested changes
Oct 17, 2018
p2p/enode/node.go
Outdated
| @@ -253,3 +253,13 @@ func RandomID(a ID, n int) (b ID) { | |||
| } | |||
| return b | |||
| } | |||
|
|
|||
| // Equal returns a boolean reporting whether a and b contain the same bytes. | |||
| func Equal(a, b ID) bool { | |||
There was a problem hiding this comment.
ID is an array type, you can just compare them with ==. Please remove this function.
p2p/metrics.go
Outdated
| @@ -190,7 +189,7 @@ func (c *meteredConn) handshakeDone(nodeID enode.ID) { | |||
| func (c *meteredConn) Close() error { | |||
| err := c.Conn.Close() | |||
| c.lock.RLock() | |||
| if c.id == "" { | |||
| if enode.Equal(c.id, enode.ID{}) { | |||
There was a problem hiding this comment.
Suggested change
| if enode.Equal(c.id, enode.ID{}) { | |
| if c.id == (enode.ID{}) { |
fjl
approved these changes
Nov 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change the type of the metered connection's
idfield fromstringtoenode.ID.