Skip to content

Check that master key is returned when querying device for first time#1166

Merged
erikjohnston merged 5 commits intodevelopfrom
erikj/e2e_cross_signing
Nov 11, 2021
Merged

Check that master key is returned when querying device for first time#1166
erikjohnston merged 5 commits intodevelopfrom
erikj/e2e_cross_signing

Conversation

@erikjohnston
Copy link
Member

@erikjohnston erikjohnston requested a review from a team November 3, 2021 09:30
@anoadragon453
Copy link
Member

There seem to be a mix of tabs vs. spaces going on here.

@erikjohnston
Copy link
Member Author

There seem to be a mix of tabs vs. spaces going on here.

WHY WOULD YOU DO THIS TO ME VIM WHY 😭


loggers => {
synapse => {
level => "INFO"
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this just for temporary debugging?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh blast, I carefully didn't add this, and then clearly did a git commit -a.

@DMRobertson DMRobertson requested a review from a team November 3, 2021 13:06
@DMRobertson
Copy link
Contributor

DMRobertson commented Nov 3, 2021

https://github.com/matrix-org/sytest/runs/4091934296?check_suite_focus=true Looks like #1164.
https://github.com/matrix-org/sytest/runs/4091934326?check_suite_focus=true and https://github.com/matrix-org/sytest/runs/4091934384?check_suite_focus=true look like #1044. Does your branch contain the change from #1154 ?

Edit: yes, it does. Bugger.

https://github.com/matrix-org/sytest/runs/4091934438?check_suite_focus=true failed to install dendrite. go install failed with some kind of http error. Assume flake.

@erikjohnston
Copy link
Member Author

/me waits to see how else he has messed up this PR

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

Seems reasonable; one question

Comment on lines +664 to +667
assert_json_keys( $content->{master_keys}, $user2_id );
assert_json_keys( $content->{master_keys}->{$user2_id}, "keys");
assert_json_keys( $content->{master_keys}->{$user2_id}{keys},
"ed25519:nqOvzeuGWT/sRx3h7+MHoInYj3Uk2LD/unI9kDYcHwk");
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we also expect to see this in the second call to matrix_get_e2e_keys on +685?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes we should. I suppose its worth checking that its still there

Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

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

Thanks!

@erikjohnston erikjohnston merged commit 491d3fe into develop Nov 11, 2021
@erikjohnston erikjohnston deleted the erikj/e2e_cross_signing branch November 11, 2021 11:50
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.

3 participants