Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-31 18:18:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary resolve_events_with_state_map

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

28
synapse/state/v1.py
View file

@ -30,34 +30,6 @@ logger = logging.getLogger(__name__)
POWER_KEY = (EventTypes.PowerLevels, "")
def resolve_events_with_state_map(state_sets, state_map):
"""
Args:
state_sets(list): List of dicts of (type, state_key) -> event_id,
which are the different state groups to resolve.
state_map(dict): a dict from event_id to event, for all events in
state_sets.
Returns
dict[(str, str), str]:
a map from (type, state_key) to event_id.
"""
if len(state_sets) == 1:
return state_sets[0]
unconflicted_state, conflicted_state = _seperate(
state_sets,
)
auth_events = _create_auth_events_from_maps(
unconflicted_state, conflicted_state, state_map
)
return _resolve_with_state(
unconflicted_state, conflicted_state, auth_events, state_map
)
@defer.inlineCallbacks
def resolve_events_with_factory(state_sets, event_map, state_map_factory):
"""