fix: a few edge cases for find_enr() + distinction of same logs #1350
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
KolbyML
changed the title
njgheorghita
approved these changes
Aug 1, 2024
portalnet/src/overlay/service.rs
Outdated
| @@ -948,7 +948,7 @@ where | |||
| // Generate a connection ID for the uTP connection. | |||
| let enr = self.find_enr(source).ok_or_else(|| { | |||
| OverlayRequestError::AcceptError( | |||
| "unable to find ENR for NodeId".to_string(), | |||
| "handle_offer_content: unable to find ENR for NodeId".to_string(), | |||
There was a problem hiding this comment.
should this be handle_find_content? that's the function we're inside at this point
| @@ -2497,6 +2496,14 @@ where | |||
| return Some(entry.value().clone().enr()); | |||
| } | |||
|
|
|||
| if let kbucket::Entry::Pending(mut entry, _) = self.kbuckets.write().entry(&key) { | |||
There was a problem hiding this comment.
I'd add a comment explaining the purpose/motivation for checking kbuckets before find_enr
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.
What was wrong?
Which is still popping up just a lot less, I think this is due to a few different edge cases
Also it is annoying because we use the same log in 2 different functions
How was it fixed?
find_enr()callfind_enr()