diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-04 16:30:15 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-04 16:30:15 +0000 |
commit | d45e2302ed831fe517aaf5641e736630408c8a8e (patch) | |
tree | ba5461808618f848b94d15a67a42f330a45387e3 /synapse/state.py | |
parent | Apply sanity to the transport client interface. Convert 'make_join' and 'send... (diff) | |
parent | Change context.auth_events to what the auth_events would be bases on context.... (diff) | |
download | synapse-d45e2302ed831fe517aaf5641e736630408c8a8e.tar.xz |
Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries
Diffstat (limited to 'synapse/state.py')
-rw-r--r-- | synapse/state.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py index 6a6fb8aea0..695a5e7ac4 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -103,7 +103,9 @@ class StateHandler(object): context.state_group = None if hasattr(event, "auth_events") and event.auth_events: - auth_ids = zip(*event.auth_events)[0] + auth_ids = self.hs.get_auth().compute_auth_events( + event, context.current_state + ) context.auth_events = { k: v for k, v in context.current_state.items() @@ -149,7 +151,9 @@ class StateHandler(object): event.unsigned["replaces_state"] = replaces.event_id if hasattr(event, "auth_events") and event.auth_events: - auth_ids = zip(*event.auth_events)[0] + auth_ids = self.hs.get_auth().compute_auth_events( + event, context.current_state + ) context.auth_events = { k: v for k, v in context.current_state.items() |