diff options
| author | Erik Johnston <erikj@jki.re> | 2018-10-24 11:12:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:12:12 +0100 |
| commit | 3904cbf30761e7cbeea633467262837c62ef5829 (patch) | |
| tree | fbd67b9770bae377e2a6427d6023523595ede1f2 /synapse/state/v1.py | |
| parent | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts (diff) | |
| parent | isort (diff) | |
| download | synapse-3904cbf30761e7cbeea633467262837c62ef5829.tar.xz | |
Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase
Add v2 state resolution algorithm
Diffstat (limited to 'synapse/state/v1.py')
| -rw-r--r-- | synapse/state/v1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 7a7157b352..70a981f4a2 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -31,7 +31,7 @@ POWER_KEY = (EventTypes.PowerLevels, "") @defer.inlineCallbacks -def resolve_events_with_factory(state_sets, event_map, state_map_factory): +def resolve_events_with_store(state_sets, event_map, state_map_factory): """ Args: state_sets(list): List of dicts of (type, state_key) -> event_id, |