Optimise state resolution

This commit is contained in:
Erik Johnston 2017-01-13 13:16:54 +00:00
parent beda469bc6
commit 5d6bad1b3c
7 changed files with 230 additions and 73 deletions

View file

@ -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
)