fix(bitswap): simplify SessionInterestManager#821
Merged
guillaumemichel merged 3 commits intomainfrom Jan 31, 2025
Merged
Conversation
This was referenced Jan 29, 2025
gammazero
approved these changes
Jan 31, 2025
Contributor
gammazero
left a comment
There was a problem hiding this comment.
Thanky for following up in this. Couple of comments to fix, now that there is no distinction between wants and interests.
bitswap/client/internal/sessioninterestmanager/sessioninterestmanager.go
Outdated
Show resolved
Hide resolved
bitswap/client/internal/sessioninterestmanager/sessioninterestmanager.go
Outdated
Show resolved
Hide resolved
Co-authored-by: Andrew Gillis <11790789+gammazero@users.noreply.github.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
@@ Coverage Diff @@
## main #821 +/- ##
=======================================
Coverage 60.46% 60.46%
=======================================
Files 244 244
Lines 31100 31081 -19
=======================================
- Hits 18805 18794 -11
+ Misses 10617 10607 -10
- Partials 1678 1680 +2
|
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
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.
Follow up to #752
After investigating around 6cd1ed9, I found that
SessionInterestManagerkeeping track ofInterestedsession, doesn't have a single use case, as @Wondertan suggested.SessionInterestManageris recording a session'swants(blocks that we want, and that we didn't get yet), as well asinterests(block that we want, and we have already).SessionsInterestManagerisn't doing anything about theinterests, hence I removedintereststracking altogether.cc: @gammazero