diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:04:53 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:04:53 +0000 |
commit | 875a481a1ee055ece27ddc31906cc37bc7983dcd (patch) | |
tree | 29c75f4dd4e5d9f356937c50395a0af5fba4200b /synapse/state.py | |
parent | Add support for storing rejected events in EventContext and data stores (diff) | |
parent | Remove commented line (diff) | |
download | synapse-875a481a1ee055ece27ddc31906cc37bc7983dcd.tar.xz |
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
Diffstat (limited to 'synapse/state.py')
-rw-r--r-- | synapse/state.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/synapse/state.py b/synapse/state.py index 5b622ad3b1..dff11711a6 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -37,13 +37,15 @@ def _get_state_key_from_event(event): KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key")) +AuthEventTypes = (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,) + + class StateHandler(object): """ Responsible for doing state conflict resolution. """ def __init__(self, hs): self.store = hs.get_datastore() - # self.auth = hs.get_auth() self.hs = hs @defer.inlineCallbacks @@ -215,7 +217,7 @@ class StateHandler(object): auth_events = { k: e for k, e in unconflicted_state.items() - if k[0] in (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,) + if k[0] in AuthEventTypes } try: @@ -240,10 +242,6 @@ class StateHandler(object): 1. power levels 2. memberships 3. other events. - - :param conflicted_state: - :param auth_events: - :return: """ resolved_state = {} power_key = (EventTypes.PowerLevels, "") @@ -295,7 +293,7 @@ class StateHandler(object): # get around circular deps. self.hs.get_auth().check(event, auth_events) return event - except AuthError as e: + except AuthError: pass # Oh dear. @@ -305,4 +303,4 @@ class StateHandler(object): def key_func(e): return -int(e.depth), hashlib.sha1(e.event_id).hexdigest() - return sorted(events, key=key_func) \ No newline at end of file + return sorted(events, key=key_func) |