|
@@ -25,7 +25,6 @@ from typing import (
|
|
|
Iterable,
|
|
|
List,
|
|
|
Optional,
|
|
|
- Sequence,
|
|
|
Set,
|
|
|
Tuple,
|
|
|
)
|
|
@@ -51,7 +50,7 @@ from synapse.storage.databases.main.search import SearchEntry
|
|
|
from synapse.storage.engines import PostgresEngine
|
|
|
from synapse.storage.util.id_generators import AbstractStreamIdGenerator
|
|
|
from synapse.storage.util.sequence import SequenceGenerator
|
|
|
-from synapse.types import JsonDict, StateMap, get_domain_from_id
|
|
|
+from synapse.types import JsonDict, StateMap, StrCollection, get_domain_from_id
|
|
|
from synapse.util import json_encoder
|
|
|
from synapse.util.iterutils import batch_iter, sorted_topologically
|
|
|
from synapse.util.stringutils import non_null_str_or_none
|
|
@@ -552,7 +551,7 @@ class PersistEventsStore:
|
|
|
event_chain_id_gen: SequenceGenerator,
|
|
|
event_to_room_id: Dict[str, str],
|
|
|
event_to_types: Dict[str, Tuple[str, str]],
|
|
|
- event_to_auth_chain: Dict[str, Sequence[str]],
|
|
|
+ event_to_auth_chain: Dict[str, StrCollection],
|
|
|
) -> None:
|
|
|
"""Calculate the chain cover index for the given events.
|
|
|
|
|
@@ -846,7 +845,7 @@ class PersistEventsStore:
|
|
|
event_chain_id_gen: SequenceGenerator,
|
|
|
event_to_room_id: Dict[str, str],
|
|
|
event_to_types: Dict[str, Tuple[str, str]],
|
|
|
- event_to_auth_chain: Dict[str, Sequence[str]],
|
|
|
+ event_to_auth_chain: Dict[str, StrCollection],
|
|
|
events_to_calc_chain_id_for: Set[str],
|
|
|
chain_map: Dict[str, Tuple[int, int]],
|
|
|
) -> Dict[str, Tuple[int, int]]:
|