Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-19 01:14:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func

Browse source 
Remove unnecessary resolve_events_with_state_map
This commit is contained in:
Erik Johnston 2018-09-03 16:19:41 +01:00 • committed by GitHub
commit 567363e497
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/federation.py
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