Merge pull request #954 from matrix-org/markjh/even_more_fixes

Fix a couple of bugs in the transaction and keyring code

synapse/crypto/keyring.py

@@ -275,14 +275,15 @@ class Keyring(object):
                     for server_name, groups in missing_groups.items()
                 }
 
-            for group in missing_groups.values():
+            for groups in missing_groups.values():
-                group_id_to_deferred[group.group_id].errback(SynapseError(
+                for group in groups:
-                    401,
+                    group_id_to_deferred[group.group_id].errback(SynapseError(
-                    "No key for %s with id %s" % (
+                        401,
-                        group.server_name, group.key_ids,
+                        "No key for %s with id %s" % (
-                    ),
+                            group.server_name, group.key_ids,
-                    Codes.UNAUTHORIZED,
+                        ),
-                ))
+                        Codes.UNAUTHORIZED,
+                    ))
 
         def on_err(err):
             for deferred in group_id_to_deferred.values():

synapse/storage/transactions.py

@@ -24,6 +24,7 @@ from collections import namedtuple
 
 import itertools
 import logging
+import ujson as json
 
 logger = logging.getLogger(__name__)
 
@@ -101,7 +102,7 @@ class TransactionStore(SQLBaseStore):
         )
 
         if result and result["response_code"]:
-            return result["response_code"], result["response_json"]
+            return result["response_code"], json.loads(str(result["response_json"]))
         else:
             return None