p2p/enr: parse ENRs with enode #1011
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
Codecov Report
@@ Coverage Diff @@
## main #1011 +/- ##
==========================================
- Coverage 54.16% 53.56% -0.61%
==========================================
Files 118 119 +1
Lines 13215 13282 +67
==========================================
- Hits 7158 7114 -44
- Misses 5030 5143 +113
+ Partials 1027 1025 -2
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
corverroos
reviewed
Aug 21, 2022
p2p/enr_test.go
Outdated
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), "input contains more than one value") | ||
| } | ||
|
|
||
| func TestBackwardsENR(t *testing.T) { | ||
| oldVersionENR := "enr:-HW4QHwvU8usykhaKQ_cxyAaAck_TlS0zr9nLNXDODQll87ifLECDsnczJz7vC_aVTKq9Q8aC3UIKWwls1i4TmEXLAuAgmlkgnY0iXNlY3AyNTZrMaEDhry2ryLc-Y39laN92yfixHghkWIjLeQ4orBvDQy20jA=" |
There was a problem hiding this comment.
better do 100 random old ENRs (copy old EncodeENR to test file)
There was a problem hiding this comment.
also see encoding/base64/base64_test.go:62
corverroos
approved these changes
Aug 21, 2022
corverroos
reviewed
Aug 21, 2022
p2p/enr.go
Outdated
Comment on lines
41
to
42
| if strings.HasSuffix(enrStr, "=") { | ||
| enrStr = enrStr[:len(enrStr)-1] |
corverroos
added
the
do not merge
|
Just adding "do not merge" until we fully understand why things were not breaking sooner |
corverroos
suggested changes
Aug 22, 2022
cmd/createcluster.go
Outdated
Comment on lines
393
to
396
| p2pConfig := p2p.Config{ | ||
| TCPAddrs: []string{"127.0.0.1:3610"}, | ||
| UDPAddr: "127.0.0.1:3630", | ||
| } |
There was a problem hiding this comment.
don't understand why this is required
| if !ok { | ||
| return enr.Record{}, errors.New("invalid ENR with no prefix (enr:)") | ||
| } | ||
| // Ensure backwards compatibility with older versions with encoded ENR strings. |
There was a problem hiding this comment.
add comment what that older actually did
| } | ||
| } | ||
|
|
||
| func encodeOldVersion(t *testing.T, r enr.Record) string { |
There was a problem hiding this comment.
add comment what this is
p2p/enr_test.go
Outdated
|
|
||
| func TestBackwardsENR(t *testing.T) { | ||
| random := rand.New(rand.NewSource(time.Now().Unix())) | ||
| for i := 0; i < 1000; i++ { |
testutil/compose/define.go
Outdated
Comment on lines
319
to
322
| config := p2p.Config{ | ||
| TCPAddrs: []string{"127.0.0.1:3610"}, | ||
| UDPAddr: "127.0.0.1:3630", | ||
| } |
corverroos
approved these changes
Aug 23, 2022
corverroos
removed
the
do not merge
dB2510
added
the
merge when ready
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.
Corrects ENR encode/decode base64 format with the help of enode.
category: bug
ticket: #970