diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-05 18:21:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-05 18:21:19 +0100 |
| commit | 0c4ac271ca2c9e46e20ba9546f0e6f1983d8e923 (patch) | |
| tree | aa5af8e6167cffa28a30d5eb329db1203678103c /synapse/federation | |
| parent | Don't insert without deduplication. In this case we never actually use this t... (diff) | |
| parent | And use buffer(...) there as well (diff) | |
| download | synapse-0c4ac271ca2c9e46e20ba9546f0e6f1983d8e923.tar.xz | |
Merge branch 'erikj/executemany' of github.com:matrix-org/synapse into erikj/SYN-371
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 2 | ||||
| -rw-r--r-- | synapse/federation/persistence.py | 6 |
2 files changed, 3 insertions, 5 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..1a7cc02f92 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 @@ -101,5 +99,5 @@ class TransactionActions(object): transaction.transaction_id, transaction.destination, response_code, - encode_canonical_json(response_dict) + response_dict, ) |