comment + minor cleanup

synapse/rest/client/devices.py

@@ -29,7 +29,6 @@
     parse_integer,
 )
 from synapse.http.site import SynapseRequest
-from synapse.replication.http.devices import ReplicationUploadKeysForUserRestServlet
 from synapse.rest.client._base import client_patterns, interactive_auth_handler
 from synapse.rest.client.models import AuthenticationData
 from synapse.rest.models import RequestBodyModel
@@ -480,13 +479,6 @@ def __init__(self, hs: "HomeServer"):
         self.e2e_keys_handler = hs.get_e2e_keys_handler()
         self.device_handler = handler
 
-        if hs.config.worker.worker_app is None:
-            # if main process
-            self.key_uploader = self.e2e_keys_handler.upload_keys_for_user
-        else:
-            # then a worker
-            self.key_uploader = ReplicationUploadKeysForUserRestServlet.make_client(hs)
-
     async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         requester = await self.auth.get_user_by_req(request)
 

synapse/storage/databases/main/end_to_end_keys.py

@@ -545,7 +545,8 @@ def _add_e2e_one_time_keys_txn(
              user_id: id of user to get keys for
              device_id: id of device to get keys for
              time_now: insertion time to record (ms since epoch)
-             new_keys: keys to add - each a tuple of (algorithm, key_id, key json)
+             new_keys: keys to add - each a tuple of (algorithm, key_id, key json) - note
+             that the key JSON must be in canonical JSON form
         """
         set_tag("user_id", user_id)
         set_tag("device_id", device_id)