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/handlers/federation.py | |
| 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/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 1021bcc405..ced5646e9a 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -596,7 +596,7 @@ class FederationHandler(BaseHandler): preserve_fn(self.state_handler.resolve_state_groups)(room_id, [e]) for e in event_ids ])) - states = dict(zip(event_ids, [s[1] for s in states])) + states = dict(zip(event_ids, [s.state for s in states])) state_map = yield self.store.get_events( [e_id for ids in states.values() for e_id in ids], @@ -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 ) |