diff options
author | Sean Quah <seanq@element.io> | 2021-11-30 12:18:02 +0000 |
---|---|---|
committer | Sean Quah <seanq@element.io> | 2021-11-30 12:18:02 +0000 |
commit | 07580acdc08807d623f0fe4953dbed34b6ff2d87 (patch) | |
tree | 976c48084bd9ef2980410bbc4b9744c28bf6a181 /synapse/state/v1.py | |
parent | Add tests for remote spaces (diff) | |
parent | Support the stable /hierarchy endpoint from MSC2946 (#11329) (diff) | |
download | synapse-07580acdc08807d623f0fe4953dbed34b6ff2d87.tar.xz |
Merge branch 'develop' into squah/leave_space_admin_api
Diffstat (limited to 'synapse/state/v1.py')
-rw-r--r-- | synapse/state/v1.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 6edadea550..499a328201 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -17,6 +17,7 @@ import logging from typing import ( Awaitable, Callable, + Collection, Dict, Iterable, List, @@ -44,7 +45,7 @@ async def resolve_events_with_store( room_version: RoomVersion, state_sets: Sequence[StateMap[str]], event_map: Optional[Dict[str, EventBase]], - state_map_factory: Callable[[Iterable[str]], Awaitable[Dict[str, EventBase]]], + state_map_factory: Callable[[Collection[str]], Awaitable[Dict[str, EventBase]]], ) -> StateMap[str]: """ Args: |