summary refs log tree commit diff
path: root/synapse/storage/persist_events.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-01-31 10:56:42 +0000
committerGitHub <noreply@github.com>2020-01-31 10:56:42 +0000
commit160522e32cb92b5fb4f0bcd8e3c53d0a4d04ad3f (patch)
treef49255e22a2840ac954f911e7b263a1e709ce9c4 /synapse/storage/persist_events.py
parentFix bug with getting missing auth event during join 500'ed (#6810) (diff)
parentnewsfile (diff)
downloadsynapse-160522e32cb92b5fb4f0bcd8e3c53d0a4d04ad3f.tar.xz
Merge pull request #6820 from matrix-org/rav/get_room_version_id
Make `get_room_version` return a RoomVersion object
Diffstat (limited to 'synapse/storage/persist_events.py')
-rw-r--r--synapse/storage/persist_events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/persist_events.py b/synapse/storage/persist_events.py
index 86166fd4c1..af3fd67ab9 100644
--- a/synapse/storage/persist_events.py
+++ b/synapse/storage/persist_events.py
@@ -661,7 +661,7 @@ class EventsPersistenceStorage(object):
                 break
 
         if not room_version:
-            room_version = await self.main_store.get_room_version(room_id)
+            room_version = await self.main_store.get_room_version_id(room_id)
 
         logger.debug("calling resolve_state_groups from preserve_events")
         res = await self._state_resolution_handler.resolve_state_groups(