From aaaf086f6f4396399cf5fa0e395c40e57cb9fa75 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 9 Nov 2018 14:59:09 -0500 Subject: [PATCH] fix variable name collision --- synapse/handlers/e2e_keys.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 709ec54e99..48d05d35ce 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -341,7 +341,7 @@ class E2eKeysHandler(object): defer.returnValue({"one_time_key_counts": result}) @defer.inlineCallbacks - def _upload_attestations_from_user(self, user_id, attestations): + def _upload_attestations_from_user(self, req_user_id, attestations): if not isinstance(attestations, list): raise SynapseError( 400, @@ -356,10 +356,10 @@ class E2eKeysHandler(object): "keys": x["keys"], "state": x["state"], "signatures": { - user_id: x["signatures"][user_id] + req_user_id: x["signatures"][req_user_id] } } - for x in attestations if user_id in x["signatures"]] + for x in attestations if req_user_id in x["signatures"]] yield self.store.add_e2e_attestations( attestations