mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-09 15:02:09 +00:00
Rename _get_e2e_device_keys_txn
(#8222)
... to `_get_e2e_device_keys_and_signatures_txn`, to better reflect what it does.
This commit is contained in:
parent
54f8d73c00
commit
5615eb5cb4
1
changelog.d/8222.misc
Normal file
1
changelog.d/8222.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Refactor queries for device keys and cross-signatures.
|
@ -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,
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user