summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-02-06 11:32:33 +0000
committerGitHub <noreply@github.com>2020-02-06 11:32:33 +0000
commit9bcd37146e2b062554184ef4a609e587790114f0 (patch)
tree05986ba5e294d63eefe38d5e7835792a34ac81a7 /synapse/handlers/federation.py
parentMerge tag 'v1.10.0rc2' into develop (diff)
parentNewsfile (diff)
downloadsynapse-9bcd37146e2b062554184ef4a609e587790114f0.tar.xz
Merge pull request #6823 from matrix-org/rav/redact_changes/5
pass room versions around
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 8c6a142991..ef3cc264b7 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1156,7 +1156,7 @@ class FederationHandler(BaseHandler):
         Logs a warning if we can't find the given event.
         """
 
-        room_version = await self.store.get_room_version_id(room_id)
+        room_version = await self.store.get_room_version(room_id)
 
         event_infos = []
 
@@ -1962,11 +1962,7 @@ class FederationHandler(BaseHandler):
 
         for e_id in missing_auth_events:
             m_ev = await self.federation_client.get_pdu(
-                [origin],
-                e_id,
-                room_version=room_version.identifier,
-                outlier=True,
-                timeout=10000,
+                [origin], e_id, room_version=room_version, outlier=True, timeout=10000,
             )
             if m_ev and m_ev.event_id == e_id:
                 event_map[e_id] = m_ev