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

Migrate encryption state on room upgrade #4411

Merged
merged 2 commits into from Jan 21, 2019

Conversation

Projects
None yet
5 participants
@anoadragon453
Copy link
Member

anoadragon453 commented Jan 17, 2019

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off

Sytest PR: matrix-org/sytest#542

anoadragon453 added some commits Jan 17, 2019

Migrate encryption state on room upgrade
Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 17, 2019

Codecov Report

Merging #4411 into develop will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           develop   #4411      +/-   ##
==========================================
+ Coverage    73.69%   73.7%   +0.01%     
==========================================
  Files          300     300              
  Lines        29819   29820       +1     
  Branches      4898    4898              
==========================================
+ Hits         21975   21979       +4     
+ Misses        6405    6401       -4     
- Partials      1439    1440       +1
Impacted Files Coverage Δ
synapse/handlers/room.py 83.61% <ø> (ø) ⬆️
synapse/api/constants.py 100% <100%> (ø) ⬆️
synapse/handlers/search.py 80.24% <0%> (ø) ⬆️
synapse/handlers/federation.py 61.72% <0%> (ø) ⬆️
synapse/federation/federation_server.py 71.62% <0%> (+0.82%) ⬆️

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 676cf2e...1eefbd6. Read the comment docs.

@anoadragon453 anoadragon453 requested a review from matrix-org/synapse-core Jan 17, 2019

@richvdh
Copy link
Member

richvdh left a comment

well, that was complicated.

@ara4n
Copy link
Member

ara4n left a comment

clone_exiting_room or existing room ooi?

@ara4n
Copy link
Member

ara4n left a comment

why wouldn’t we clone all state? we don’t want widgets etc to vanish

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Jan 17, 2019

clone_exiting_room or existing room ooi?

oops

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Jan 17, 2019

why wouldn’t we clone all state? we don’t want widgets etc to vanish

well, for one, we can't clone the members, or the create...

It's not obvious to me that we want to copy any arbitrary state that a client may have set. Maybe, though.

@anoadragon453

This comment has been minimized.

Copy link
Member Author

anoadragon453 commented Jan 18, 2019

clone_exiting_room or existing room ooi?

oops

This is fixed in aaacb6c btw

@hawkowl hawkowl merged commit 702c4b7 into develop Jan 21, 2019

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hawkowl hawkowl deleted the anoa/encryption_room_upgrade branch Jan 21, 2019

@hawkowl hawkowl restored the anoa/encryption_room_upgrade branch Jan 21, 2019

hawkowl added a commit that referenced this pull request Jan 21, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment