mirror of
https://github.com/element-hq/synapse.git
synced 2026-08-03 04:49:29 +00:00
Eric EastwoodandGitHub
fba14358a7
Fix `RemoteJoinHelper` signing events with mismatched room version compared to the `room_version` arg. The default room version on `develop` is `11` but the `RemoteJoinHelper` `room_version` arg defaults to `10` (room version mismatch). This mismatch wasn't present where this fix was developed (https://github.com/element-hq/synapse-private/pull/136) as the default room version was only recently bumped to `11` via https://github.com/element-hq/synapse/pull/18680 (not even in a release yet). Fixes the CI being broken on `develop` :x:: ``` [ERROR] Traceback (most recent call last): File "/home/runner/work/synapse/synapse/tests/federation/test_federation_join_upgraded_room.py", line 298, in test_no_transfer_when_tombstone_does_not_match join_helper.join(local_user_id, local_user_tok) File "/home/runner/work/synapse/synapse/tests/federation/_remote_join.py", line 350, in join self._test_case.helper.join(remote_room_id, local_user_id, tok=local_user_tok) File "/home/runner/work/synapse/synapse/tests/rest/client/utils.py", line 195, in join return self.change_membership( File "/home/runner/work/synapse/synapse/tests/rest/client/utils.py", line 333, in change_membership assert channel.code == expect_code, ( builtins.AssertionError: Expected: 200, got: 400, PUT /_matrix/client/r0/rooms/!remote-room:other.example.com/state/m.room.member/@user1:test?access_token=syt_dXNlcjE_JSEarRndiAGqtydnrdLn_33qlLD -> resp: b'{"errcode":"M_UNKNOWN","error":"No create event in state"}' tests.federation.test_federation_join_upgraded_room.FederationJoinUpgradedRoomTestCase.test_no_transfer_when_tombstone_does_not_match ``` These tests were originally introduced https://github.com/element-hq/synapse-private/pull/136 (developed private as this was part of the Synapse security release) and introduced into the public codebase via https://github.com/element-hq/synapse/commit/cbc6934821aab314506c5957223c60c74eeda091