Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get db signatures file to pass mypy (#11312)

This commit is contained in:
David Robertson 2021-11-11 17:04:44 +00:00 committed by GitHub
parent 8dc666f785
commit 6a605f4a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Add type hints to storage classes.

1
mypy.ini
View File

@ -48,7 +48,6 @@ exclude = (?x)
|synapse/storage/databases/main/room.py |synapse/storage/databases/main/room.py
|synapse/storage/databases/main/roommember.py |synapse/storage/databases/main/roommember.py
|synapse/storage/databases/main/search.py |synapse/storage/databases/main/search.py
|synapse/storage/databases/main/signatures.py
|synapse/storage/databases/main/state.py |synapse/storage/databases/main/state.py
|synapse/storage/databases/main/state_deltas.py |synapse/storage/databases/main/state_deltas.py
|synapse/storage/databases/main/stats.py |synapse/storage/databases/main/stats.py

12
synapse/events/builder.py
View File

@ -128,14 +128,12 @@ class EventBuilder:
) )
format_version = self.room_version.event_format format_version = self.room_version.event_format
# The types of auth/prev events changes between event versions.
prev_events: Union[List[str], List[Tuple[str, Dict[str, str]]]]
auth_events: Union[List[str], List[Tuple[str, Dict[str, str]]]]
if format_version == EventFormatVersions.V1: if format_version == EventFormatVersions.V1:
# The types of auth/prev events changes between event versions. auth_events = await self._store.add_event_hashes(auth_event_ids)
auth_events: Union[ prev_events = await self._store.add_event_hashes(prev_event_ids)
List[str], List[Tuple[str, Dict[str, str]]]
] = await self._store.add_event_hashes(auth_event_ids)
prev_events: Union[
List[str], List[Tuple[str, Dict[str, str]]]
] = await self._store.add_event_hashes(prev_event_ids)
else: else:
auth_events = auth_event_ids auth_events = auth_event_ids
prev_events = prev_event_ids prev_events = prev_event_ids

4
synapse/storage/databases/main/signatures.py
View File

@ -63,12 +63,12 @@ class SignatureWorkerStore(SQLBaseStore):
A list of tuples of event ID and a mapping of algorithm to base-64 encoded hash. A list of tuples of event ID and a mapping of algorithm to base-64 encoded hash.
""" """
hashes = await self.get_event_reference_hashes(event_ids) hashes = await self.get_event_reference_hashes(event_ids)
hashes = { encoded_hashes = {
e_id: {k: encode_base64(v) for k, v in h.items() if k == "sha256"} e_id: {k: encode_base64(v) for k, v in h.items() if k == "sha256"}
for e_id, h in hashes.items() for e_id, h in hashes.items()
} }
return list(hashes.items()) return list(encoded_hashes.items())
def _get_event_reference_hashes_txn( def _get_event_reference_hashes_txn(
self, txn: Cursor, event_id: str self, txn: Cursor, event_id: str