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

Depend on Tahoe-LAFS 1.17.1 #282

Merged
merged 12 commits into from
Jan 12, 2022
Merged

Depend on Tahoe-LAFS 1.17.1 #282

merged 12 commits into from
Jan 12, 2022

Conversation

exarkun
Copy link
Collaborator

@exarkun exarkun commented Jan 10, 2022

Stacked on #278
Fixes #280

@exarkun exarkun changed the base branch from main to 235.backup-and-recovery January 11, 2022 14:23
@exarkun exarkun changed the base branch from 235.backup-and-recovery to main January 11, 2022 14:23
@codecov
Copy link

codecov bot commented Jan 11, 2022

Codecov Report

Merging #282 (78115ef) into main (4f59ff8) will decrease coverage by 0.00%.
The diff coverage is 80.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #282      +/-   ##
==========================================
- Coverage   91.76%   91.76%   -0.01%     
==========================================
  Files          51       51              
  Lines        4677     4689      +12     
  Branches      643      645       +2     
==========================================
+ Hits         4292     4303      +11     
- Misses        336      338       +2     
+ Partials       49       48       -1     
Impacted Files Coverage Δ
src/_zkapauthorizer/controller.py 94.47% <ø> (ø)
src/_zkapauthorizer/tests/test_storage_server.py 34.43% <28.57%> (+0.14%) ⬆️
src/_zkapauthorizer/tests/foolscap.py 95.23% <50.00%> (-1.64%) ⬇️
src/_zkapauthorizer/_storage_server.py 91.17% <90.00%> (+0.30%) ⬆️
src/_zkapauthorizer/tests/fixtures.py 100.00% <100.00%> (ø)
src/_zkapauthorizer/tests/storage_common.py 100.00% <100.00%> (ø)
src/_zkapauthorizer/tests/test_storage_protocol.py 91.42% <100.00%> (ø)
src/_zkapauthorizer/tests/test_model.py 93.30% <0.00%> (-0.40%) ⬇️
src/_zkapauthorizer/model.py 94.87% <0.00%> (+0.64%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4f59ff8...78115ef. Read the comment docs.

@@ -140,7 +140,8 @@ def get_storage_server(
registry=registry,
)
storage_server = ZKAPAuthorizerStorageServer(
anonymous_storage_server,
# unwrap the Foolscap layer, we'll do it ourselves.
anonymous_storage_server._server,
Copy link
Contributor

Choose a reason for hiding this comment

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

Based on running the PrivateStorageio system tests, this is incorrect, as anonymous_storage_server is already a StorageServer, not a FoolscapStorageServer.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for this catch. I'm surprised this is what Tahoe is doing now ... but since it is easier to deal with than what I expected, I guess I won't complain. 🙂

This suggests an integration test would be useful.
Copy link
Contributor

@tomprince tomprince left a comment

Choose a reason for hiding this comment

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

This looks good. There are a couple of minor things to change in the tests (mostly around naming to align with upstream), but is good to merge after that. (I assume that most of the coverage annotation things are due to codecov not working properly)

src/_zkapauthorizer/_storage_server.py Show resolved Hide resolved
src/_zkapauthorizer/_storage_server.py Show resolved Hide resolved
src/_zkapauthorizer/tests/foolscap.py Outdated Show resolved Hide resolved
src/_zkapauthorizer/tests/fixtures.py Outdated Show resolved Hide resolved
src/_zkapauthorizer/tests/test_storage_protocol.py Outdated Show resolved Hide resolved
src/_zkapauthorizer/tests/test_storage_server.py Outdated Show resolved Hide resolved
src/_zkapauthorizer/tests/test_storage_server.py Outdated Show resolved Hide resolved
@exarkun exarkun merged commit 14cc987 into main Jan 12, 2022
@exarkun exarkun deleted the 280.tahoe-lafs-1.17.1 branch January 12, 2022 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Tahoe-LAFS 1.17.1 StorageServer is not compatible with our usage
2 participants