diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-04 07:13:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 07:13:38 +0100 |
| commit | a4ab49137192e7994b231c6a8204baa452c9a8d6 (patch) | |
| tree | 680f11091640bf6dedeb75922f2a90bafcc27d9f /synapse/state.py | |
| parent | Remove event re-signing hacks (diff) | |
| parent | Reject invalid server names (#3480) (diff) | |
| download | synapse-a4ab49137192e7994b231c6a8204baa452c9a8d6.tar.xz | |
Merge branch 'develop' into rav/drop_re_signing_hacks
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py index 216418f58d..8098db94b4 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -694,10 +694,10 @@ def _create_auth_events_from_maps(unconflicted_state, conflicted_state, state_ma return auth_events -def _resolve_with_state(unconflicted_state_ids, conflicted_state_ds, auth_event_ids, +def _resolve_with_state(unconflicted_state_ids, conflicted_state_ids, auth_event_ids, state_map): conflicted_state = {} - for key, event_ids in iteritems(conflicted_state_ds): + for key, event_ids in iteritems(conflicted_state_ids): events = [state_map[ev_id] for ev_id in event_ids if ev_id in state_map] if len(events) > 1: conflicted_state[key] = events |