summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2018-11-09 14:59:09 -0500
committerHubert Chathi <hubert@uhoreg.ca>2018-11-09 14:59:09 -0500
commitaaaf086f6f4396399cf5fa0e395c40e57cb9fa75 (patch)
treedec2092c375e50eec1e178cc3a881514f896df1c /synapse
parentinitial work on storing and retreiving attestations for cross-signing (diff)
downloadsynapse-aaaf086f6f4396399cf5fa0e395c40e57cb9fa75.tar.xz
fix variable name collision
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/e2e_keys.py6
1 files 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