From d249b292a2bc2a3efc391b03d1a3fa5bd1d9b377 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 26 Jul 2022 18:27:50 +0100 Subject: [PATCH] mypy pass --- synapse/_scripts/debug_state_res.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/synapse/_scripts/debug_state_res.py b/synapse/_scripts/debug_state_res.py index b56a195bb2..4b71934d14 100755 --- a/synapse/_scripts/debug_state_res.py +++ b/synapse/_scripts/debug_state_res.py @@ -10,11 +10,10 @@ from typing import ( Callable, Collection, Dict, - List, - Mapping, Optional, Sequence, Tuple, + cast, ) from unittest.mock import MagicMock, patch @@ -27,7 +26,6 @@ from twisted.internet import task from synapse.config._base import RootConfig from synapse.config.cache import CacheConfig from synapse.config.database import DatabaseConfig -from synapse.config.homeserver import HomeServerConfig from synapse.config.workers import WorkerConfig from synapse.events import EventBase from synapse.server import HomeServer @@ -68,14 +66,16 @@ class DataStore( class MockHomeserver(HomeServer): DATASTORE_CLASS = DataStore # type: ignore [assignment] - def __init__(self, config: HomeServerConfig): + def __init__(self, config: Config): super(MockHomeserver, self).__init__( hostname="stateres-debug", - config=config, + config=config, # type: ignore[arg-type] ) -def node(event: EventBase, suffix: Optional[str] = None, **kwargs) -> pydot.Node: +def node( + event: EventBase, suffix: Optional[str] = None, **kwargs: object +) -> pydot.Node: label = f"{event.event_id}\n{event.type}" if suffix: label += f"\n{suffix}" @@ -88,7 +88,7 @@ def node(event: EventBase, suffix: Optional[str] = None, **kwargs) -> pydot.Node return pydot.Node(q(event.event_id), **kwargs) -def edge(source: EventBase, target: EventBase, **kwargs) -> pydot.Edge: +def edge(source: EventBase, target: EventBase, **kwargs: object) -> pydot.Edge: return pydot.Edge( pydot.quote_if_necessary(source.event_id), pydot.quote_if_necessary(target.event_id), @@ -186,9 +186,11 @@ async def debug_specific_stateres( ] if args.watch is not None: - key_pair = tuple(args.watch) + key_pair = cast(Tuple[str, str], tuple(args.watch)) filter = StateFilter.from_types([key_pair]) + watch_func: Optional[Callable[[EventBase], Awaitable[str]]] + async def watch_func(event: EventBase) -> str: result = await hs.get_storage_controllers().state.get_state_ids_for_event( event.event_id, filter