diff options
| author | David Robertson <davidr@element.io> | 2021-11-11 17:04:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 17:04:44 +0000 |
| commit | 6a605f4a77bebbbffa2ac812fbff4fe5f252d88e (patch) | |
| tree | 9c62427e6d50de1e1e397007994aa2cc66b5229e /synapse | |
| parent | Correct type hint for room_batch.py (#11310) (diff) | |
| download | synapse-6a605f4a77bebbbffa2ac812fbff4fe5f252d88e.tar.xz | |
Get db signatures file to pass mypy (#11312)
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/events/builder.py | 12 | ||||
| -rw-r--r-- | synapse/storage/databases/main/signatures.py | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/synapse/events/builder.py b/synapse/events/builder.py index 4f409f31e1..eb39e0ae32 100644 --- a/synapse/events/builder.py +++ b/synapse/events/builder.py @@ -128,14 +128,12 @@ class EventBuilder: ) 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: - # The types of auth/prev events changes between event versions. - auth_events: Union[ - 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) + auth_events = await self._store.add_event_hashes(auth_event_ids) + prev_events = await self._store.add_event_hashes(prev_event_ids) else: auth_events = auth_event_ids prev_events = prev_event_ids diff --git a/synapse/storage/databases/main/signatures.py b/synapse/storage/databases/main/signatures.py index ab2159c2d3..3201623fe4 100644 --- a/synapse/storage/databases/main/signatures.py +++ b/synapse/storage/databases/main/signatures.py @@ -63,12 +63,12 @@ class SignatureWorkerStore(SQLBaseStore): 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 = { + encoded_hashes = { e_id: {k: encode_base64(v) for k, v in h.items() if k == "sha256"} for e_id, h in hashes.items() } - return list(hashes.items()) + return list(encoded_hashes.items()) def _get_event_reference_hashes_txn( self, txn: Cursor, event_id: str |