diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-05 18:15:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-05 18:15:20 +0100 |
| commit | ed2584050f4dc1e09f7e29735bbf89686e0fe04d (patch) | |
| tree | 0f71510eb24eb9168b48a7b5e0a5ae946a06685d /synapse/federation | |
| parent | Add a comment about the zip(*[zip(sorted(...),...)]) (diff) | |
| parent | Use buffer(...) when inserting into bytea column (diff) | |
| download | synapse-ed2584050f4dc1e09f7e29735bbf89686e0fe04d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 2 | ||||
| -rw-r--r-- | synapse/federation/persistence.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 6811a0e3d1..904c7c0945 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -491,7 +491,7 @@ class FederationClient(FederationBase): ] signed_events = yield self._check_sigs_and_hash_and_fetch( - destination, events, outlier=True + destination, events, outlier=False ) have_gotten_all_from_destination = True diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py index 76a9dcd777..865766eb2c 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py @@ -23,8 +23,6 @@ from twisted.internet import defer from synapse.util.logutils import log_function -from syutil.jsonutil import encode_canonical_json - import logging @@ -71,7 +69,7 @@ class TransactionActions(object): transaction.transaction_id, transaction.origin, code, - encode_canonical_json(response) + response, ) @defer.inlineCallbacks |