Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move providing responsabilities from bitswap to blockservice #677

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

gammazero
Copy link
Contributor

  • bitswap/server: remove provide
  • blockservice: add session workaround to work with wrapped blockservices
  • blockservice: add WithProvider option
  • blockservice: remove session embeding in context

Replaces #534 by @Jorropo which was outdated enough to make merging difficult.

- bitswap/server: remove provide
- blockservice: add session workaround to work with wrapped blockservices
- blockservice: add WithProvider option
- blockservice: remove session embeding in context

Replaces #534 by @Jorropo which was outdated enough to make merging difficult.
Copy link

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 49.18033% with 31 lines in your changes missing coverage. Please review.

Project coverage is 60.17%. Comparing base (19a402b) to head (6af1b50).

Files with missing lines Patch % Lines
blockservice/blockservice.go 54.76% 13 Missing and 6 partials ⚠️
blockservice/providing_blockstore.go 14.28% 11 Missing and 1 partial ⚠️

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #677      +/-   ##
==========================================
- Coverage   60.36%   60.17%   -0.20%     
==========================================
  Files         243      244       +1     
  Lines       30953    30867      -86     
==========================================
- Hits        18684    18573     -111     
- Misses      10612    10626      +14     
- Partials     1657     1668      +11     
Files with missing lines Coverage Δ
bitswap/bitswap.go 69.51% <ø> (+2.07%) ⬆️
bitswap/options.go 33.33% <ø> (-3.04%) ⬇️
bitswap/server/server.go 55.73% <100.00%> (-8.19%) ⬇️
gateway/backend_blocks.go 45.64% <ø> (+0.15%) ⬆️
blockservice/providing_blockstore.go 14.28% <14.28%> (ø)
blockservice/blockservice.go 74.41% <54.76%> (-3.82%) ⬇️

... and 10 files with indirect coverage changes

@gammazero gammazero marked this pull request as draft October 22, 2024 16:44
@gammazero
Copy link
Contributor Author

Needs kubo PR to test

@hsanjuan
Copy link
Contributor

Reviewing this and probably merging into #641 ...

Comment on lines -143 to -148
ses := grabSessionFromContext(ctx, bs)
if ses != nil {
return ses
}

return newSession(ctx, bs)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why session-grabbing from context is removed... I remember old discussions about embedding sessions in contexts etc. but not sure if used...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants