diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-01-31 10:06:21 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-01-31 10:06:21 +0000 |
| commit | d7bf793cc1e3f5268285286341835ac54753eff6 (patch) | |
| tree | 8554590b143b95f83c4a60f89a8bbbf334e3c636 /synapse/storage | |
| parent | pass room version into FederationHandler.on_invite_request (#6805) (diff) | |
| download | synapse-d7bf793cc1e3f5268285286341835ac54753eff6.tar.xz | |
s/get_room_version/get_room_version_id/
... to make way for a forthcoming get_room_version which returns a RoomVersion object.
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/data_stores/main/state.py | 2 | ||||
| -rw-r--r-- | synapse/storage/persist_events.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/state.py b/synapse/storage/data_stores/main/state.py index 4167f83c9b..6700942523 100644 --- a/synapse/storage/data_stores/main/state.py +++ b/synapse/storage/data_stores/main/state.py @@ -62,7 +62,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore): super(StateGroupWorkerStore, self).__init__(database, db_conn, hs) @cached(max_entries=10000) - async def get_room_version(self, room_id: str) -> str: + async def get_room_version_id(self, room_id: str) -> str: """Get the room_version of a given room Raises: 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( |