MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-17 23:42:33 +01:00
Code Issues Projects Releases Wiki Activity

Rename _get_e2e_device_keys_txn (#8222)

Browse source 
... to `_get_e2e_device_keys_and_signatures_txn`, to better reflect what it
does.
This commit is contained in:
Richard van der Hoff 2020-09-01 16:02:17 +01:00 committed by GitHub
parent 54f8d73c00
commit 5615eb5cb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8222.misc Normal file
View file

@ -0,0 +1 @@
Refactor queries for device keys and cross-signatures.

4
synapse/storage/databases/main/devices.py
View file

@ -256,8 +256,8 @@ class DeviceWorkerStore(SQLBaseStore):
""" """
devices = ( devices = (
await self.db_pool.runInteraction( await self.db_pool.runInteraction(
"_get_e2e_device_keys_txn", "get_e2e_device_keys_and_signatures_txn",
self._get_e2e_device_keys_txn, self._get_e2e_device_keys_and_signatures_txn,
query_map.keys(), query_map.keys(),
include_all_devices=True, include_all_devices=True,
include_deleted_devices=True, include_deleted_devices=True,

10
synapse/storage/databases/main/end_to_end_keys.py
View file

@ -51,7 +51,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
) -> Tuple[int, List[JsonDict]]: ) -> Tuple[int, List[JsonDict]]:
now_stream_id = self.get_device_stream_token() now_stream_id = self.get_device_stream_token()
devices = self._get_e2e_device_keys_txn(txn, [(user_id, None)]) devices = self._get_e2e_device_keys_and_signatures_txn(txn, [(user_id, None)])
if devices: if devices:
user_devices = devices[user_id] user_devices = devices[user_id]
@ -96,7 +96,9 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
return {} return {}
results = await self.db_pool.runInteraction( results = await self.db_pool.runInteraction(
"get_e2e_device_keys", self._get_e2e_device_keys_txn, query_list, "get_e2e_device_keys_and_signatures_txn",
self._get_e2e_device_keys_and_signatures_txn,
query_list,
) )
# Build the result structure, un-jsonify the results, and add the # Build the result structure, un-jsonify the results, and add the
@ -120,9 +122,9 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
return rv return rv
@trace @trace
def _get_e2e_device_keys_txn( def _get_e2e_device_keys_and_signatures_txn(
self, txn, query_list, include_all_devices=False, include_deleted_devices=False self, txn, query_list, include_all_devices=False, include_deleted_devices=False
): ) -> Dict[str, Dict[str, Optional[Dict]]]:
set_tag("include_all_devices", include_all_devices) set_tag("include_all_devices", include_all_devices)
set_tag("include_deleted_devices", include_deleted_devices) set_tag("include_deleted_devices", include_deleted_devices)