summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2022-11-03 12:29:13 -0700
committerH. Shay <hillerys@element.io>2022-11-03 12:29:13 -0700
commitd6211b55477ba70c99ae06dcf21e0c1e5983c18c (patch)
tree3d3a362fce910cc7e78add37eb45472eb842b5cb
parentupdate to pass in current state map when checking batched events (diff)
downloadsynapse-d6211b55477ba70c99ae06dcf21e0c1e5983c18c.tar.xz
lints
-rw-r--r--synapse/handlers/room.py1
-rw-r--r--synapse/storage/controllers/state.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index fe86e78677..04dc56e166 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -1260,6 +1260,7 @@ class RoomCreationHandler:
             events_to_send.append((encryption_event, encryption_context))
 
         assert self.hs.datastores is not None
+        assert current_state_group is not None
         state_groups = await self.hs.datastores.state.store_state_deltas_for_batched(
             events_to_send, room_id, prev_group=current_state_group
         )
diff --git a/synapse/storage/controllers/state.py b/synapse/storage/controllers/state.py
index 2b31ce54bb..6d41c8e42e 100644
--- a/synapse/storage/controllers/state.py
+++ b/synapse/storage/controllers/state.py
@@ -399,7 +399,11 @@ class StateStorageController:
             The state group ID
         """
         return await self.stores.state.store_state_group(
-            event_id, room_id, prev_group, delta_ids, current_state_ids
+            event_id,
+            room_id,
+            prev_group,
+            delta_ids,
+            current_state_ids,
         )
 
     @cancellable