summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-24 17:23:51 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-24 17:23:51 +0000
commita383289b0d64a5efa74c5d597f9e2c14732cd224 (patch)
treec314d5c316d2f5a56ac59342963f8d1cfbed2597 /synapse/storage/state.py
parentRemove redundant create event None check (diff)
parentApply suggestions from code review (diff)
downloadsynapse-a383289b0d64a5efa74c5d597f9e2c14732cd224.tar.xz
Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index c02130d9d6..c3ab7db7ae 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -446,7 +446,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
             room_id (str)
 
         Returns:
-            Deferred[str]: predecessor room id
+            Deferred[unicode|None]: predecessor room id
         """
         state_ids = yield self.get_current_state_ids(room_id)
         create_id = state_ids.get((EventTypes.Create, ""))