diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-13 13:16:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-17 13:22:19 +0000 |
| commit | 5d6bad1b3c325897db81f84ebfc67ca687d851c0 (patch) | |
| tree | ceca894c8eeab05260595e09c8bbb031103252ea /synapse/handlers/federation.py | |
| parent | Put staticmethods at module level (diff) | |
| download | synapse-5d6bad1b3c325897db81f84ebfc67ca687d851c0.tar.xz | |
Optimise state resolution
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 1021bcc405..ea89e0cf2d 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1530,7 +1530,7 @@ class FederationHandler(BaseHandler): (d.type, d.state_key): d for d in different_events if d }) - new_state, prev_state = self.state_handler.resolve_events( + new_state = self.state_handler.resolve_events( [local_view.values(), remote_view.values()], event ) |