summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-30 17:11:24 +0000
committerErik Johnston <erik@matrix.org>2017-01-30 17:11:24 +0000
commitc7a26b7c3243c3187a8d12060cb2d2a02d318260 (patch)
treeb60df0912b0ae6e71f48f897d77aab7683223e2d /synapse/handlers
parentNoop device key changes if they're the same (diff)
downloadsynapse-c7a26b7c3243c3187a8d12060cb2d2a02d318260.tar.xz
Fix unit tests
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/e2e_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py
index 49b277a1af..e40495d1ab 100644
--- a/synapse/handlers/e2e_keys.py
+++ b/synapse/handlers/e2e_keys.py
@@ -194,7 +194,7 @@ class E2eKeysHandler(object):
         # "unsigned" section
         for user_id, device_keys in results.items():
             for device_id, device_info in device_keys.items():
-                r = json.loads(device_info["key_json"])
+                r = dict(device_info["keys"])
                 r["unsigned"] = {}
                 display_name = device_info["device_display_name"]
                 if display_name is not None: