diff options
| author | David Robertson <davidr@element.io> | 2022-07-12 19:46:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-12 18:46:32 +0000 |
| commit | 52a0c8f2f7fc5a6dad02d3b6bdae90f3e58842c9 (patch) | |
| tree | eeb8950fa40ccbb10f339456d1c9631eea99a087 /tests/federation/test_federation_server.py | |
| parent | Drop support for delegating email validation (#13192) (diff) | |
| download | synapse-52a0c8f2f7fc5a6dad02d3b6bdae90f3e58842c9.tar.xz | |
Rename test case method to `add_hashes_and_signatures_from_other_server` (#13255)
Diffstat (limited to 'tests/federation/test_federation_server.py')
| -rw-r--r-- | tests/federation/test_federation_server.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/federation/test_federation_server.py b/tests/federation/test_federation_server.py index 413b3c9426..fd15e680ed 100644 --- a/tests/federation/test_federation_server.py +++ b/tests/federation/test_federation_server.py @@ -20,7 +20,6 @@ from twisted.test.proto_helpers import MemoryReactor from synapse.api.room_versions import KNOWN_ROOM_VERSIONS from synapse.config.server import DEFAULT_ROOM_VERSION -from synapse.crypto.event_signing import add_hashes_and_signatures from synapse.events import make_event_from_dict from synapse.federation.federation_server import server_matches_acl_event from synapse.rest import admin @@ -163,11 +162,9 @@ class SendJoinFederationTests(unittest.FederatingHomeserverTestCase): join_result = self._make_join(joining_user) join_event_dict = join_result["event"] - add_hashes_and_signatures( - KNOWN_ROOM_VERSIONS[DEFAULT_ROOM_VERSION], + self.add_hashes_and_signatures_from_other_server( join_event_dict, - signature_name=self.OTHER_SERVER_NAME, - signing_key=self.OTHER_SERVER_SIGNATURE_KEY, + KNOWN_ROOM_VERSIONS[DEFAULT_ROOM_VERSION], ) channel = self.make_signed_federation_request( "PUT", @@ -220,11 +217,9 @@ class SendJoinFederationTests(unittest.FederatingHomeserverTestCase): join_result = self._make_join(joining_user) join_event_dict = join_result["event"] - add_hashes_and_signatures( - KNOWN_ROOM_VERSIONS[DEFAULT_ROOM_VERSION], + self.add_hashes_and_signatures_from_other_server( join_event_dict, - signature_name=self.OTHER_SERVER_NAME, - signing_key=self.OTHER_SERVER_SIGNATURE_KEY, + KNOWN_ROOM_VERSIONS[DEFAULT_ROOM_VERSION], ) channel = self.make_signed_federation_request( "PUT", |