Remove unnecessary resolve_events_with_state_map

We only ever used the synchronous resolve_events_with_state_map in one
place, which is trivial to replace with the async version.
This commit is contained in:
Erik Johnston 2018-08-09 15:34:56 +01:00
parent c7181dcc6c
commit 5c261107c9
3 changed files with 7 additions and 57 deletions

View file

@ -1831,7 +1831,7 @@ class FederationHandler(BaseHandler):
room_version = yield self.store.get_room_version(event.room_id)
new_state = self.state_handler.resolve_events(
new_state = yield self.state_handler.resolve_events(
room_version,
[list(local_view.values()), list(remote_view.values())],
event