diff options
| author | Erik Johnston <erikj@jki.re> | 2017-01-18 10:53:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 10:53:00 +0000 |
| commit | 15f012032c74663e85a891b1111693583b06bd48 (patch) | |
| tree | 9ed0d532fb6c99b9c73acf45acac5998968a79cc /synapse/federation | |
| parent | Merge pull request #1820 from matrix-org/erikj/push_tools (diff) | |
| parent | PEP8 (diff) | |
| download | synapse-15f012032c74663e85a891b1111693583b06bd48.tar.xz | |
Merge pull request #1818 from matrix-org/erikj/state_auth_splitout_split
Optimise state resolution
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index b4bcec77ed..c9175bb33d 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -26,7 +26,7 @@ from synapse.util import unwrapFirstError from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.logutils import log_function from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred -from synapse.events import FrozenEvent +from synapse.events import FrozenEvent, builder import synapse.metrics from synapse.util.retryutils import get_retry_limiter, NotRetryingDestination @@ -499,8 +499,10 @@ class FederationClient(FederationBase): if "prev_state" not in pdu_dict: pdu_dict["prev_state"] = [] + ev = builder.EventBuilder(pdu_dict) + defer.returnValue( - (destination, self.event_from_pdu_json(pdu_dict)) + (destination, ev) ) break except CodeMessageException as e: |