OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve state types. (#16395)

pull/16401/head
Patrick Cloke 2023-09-28 07:01:46 -04:00 committed by GitHub
parent c690fd16c4
commit cdb89dcefe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/16395.misc Normal file
View File

@ -0,0 +1 @@
Improve type hints.

5
synapse/state/v2.py
View File

@ -23,7 +23,6 @@ from typing import (
Generator, Generator,
Iterable, Iterable,
List, List,
Mapping,
Optional, Optional,
Sequence, Sequence,
Set, Set,
@ -269,7 +268,7 @@ async def _get_power_level_for_sender(
async def _get_auth_chain_difference( async def _get_auth_chain_difference(
room_id: str, room_id: str,
state_sets: Sequence[Mapping[Any, str]], state_sets: Sequence[StateMap[str]],
unpersisted_events: Dict[str, EventBase], unpersisted_events: Dict[str, EventBase],
state_res_store: StateResolutionStore, state_res_store: StateResolutionStore,
) -> Set[str]: ) -> Set[str]:
@ -405,7 +404,7 @@ def _seperate(
# mypy doesn't understand that discarding None above means that conflicted # mypy doesn't understand that discarding None above means that conflicted
# state is StateMap[Set[str]], not StateMap[Set[Optional[Str]]]. # state is StateMap[Set[str]], not StateMap[Set[Optional[Str]]].
return unconflicted_state, conflicted_state # type: ignore return unconflicted_state, conflicted_state # type: ignore[return-value]
def _is_power_event(event: EventBase) -> bool: def _is_power_event(event: EventBase) -> bool:

13
tests/state/test_v2.py
View File

@ -719,7 +719,10 @@ class AuthChainDifferenceTestCase(unittest.TestCase):
persisted_events = {a.event_id: a, b.event_id: b} persisted_events = {a.event_id: a, b.event_id: b}
unpersited_events = {c.event_id: c} unpersited_events = {c.event_id: c}
state_sets = [{"a": a.event_id, "b": b.event_id}, {"c": c.event_id}] state_sets = [
{("a", ""): a.event_id, ("b", ""): b.event_id},
{("c", ""): c.event_id},
]
store = TestStateResolutionStore(persisted_events) store = TestStateResolutionStore(persisted_events)
@ -774,8 +777,8 @@ class AuthChainDifferenceTestCase(unittest.TestCase):
unpersited_events = {c.event_id: c, d.event_id: d} unpersited_events = {c.event_id: c, d.event_id: d}
state_sets = [ state_sets = [
{"a": a.event_id, "b": b.event_id}, {("a", ""): a.event_id, ("b", ""): b.event_id},
{"c": c.event_id, "d": d.event_id}, {("c", ""): c.event_id, ("d", ""): d.event_id},
] ]
store = TestStateResolutionStore(persisted_events) store = TestStateResolutionStore(persisted_events)
@ -841,8 +844,8 @@ class AuthChainDifferenceTestCase(unittest.TestCase):
unpersited_events = {c.event_id: c, d.event_id: d, e.event_id: e} unpersited_events = {c.event_id: c, d.event_id: d, e.event_id: e}
state_sets = [ state_sets = [
{"a": a.event_id, "b": b.event_id, "e": e.event_id}, {("a", ""): a.event_id, ("b", ""): b.event_id, ("e", ""): e.event_id},
{"c": c.event_id, "d": d.event_id}, {("c", ""): c.event_id, ("d", ""): d.event_id},
] ]
store = TestStateResolutionStore(persisted_events) store = TestStateResolutionStore(persisted_events)