Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly look up auth_events

This commit is contained in:
Erik Johnston 2015-06-02 10:19:38 +01:00
parent 3f04a08a0c
commit fde0da6f19
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/handlers/federation.py
View File

@ -271,9 +271,10 @@ class FederationHandler(BaseHandler):
self._handle_new_event( self._handle_new_event(
dest, a, dest, a,
auth_events={ auth_events={
(e.type, e.state_key): e for e in auth_events (auth_events[a_id].type, auth_events[a_id].state_key):
if e.event_id in [a_id for a_id, _ in a.auth_events] auth_events[a_id]
} for a_id, _ in a.auth_events
},
) )
for a in auth_events.values() for a in auth_events.values()
if a.event_id not in seen_events if a.event_id not in seen_events
@ -286,9 +287,10 @@ class FederationHandler(BaseHandler):
self._handle_new_event( self._handle_new_event(
dest, s, dest, s,
auth_events={ auth_events={
(e.type, e.state_key): e for e in auth_events (auth_events[a_id].type, auth_events[a_id].state_key):
if e.event_id in [a_id for a_id, _ in s.auth_events] auth_events[a_id]
} for a_id, _ in s.auth_events
},
) )
for s in state_events.values() for s in state_events.values()
if s.event_id not in seen_events if s.event_id not in seen_events
@ -303,9 +305,10 @@ class FederationHandler(BaseHandler):
state=events_to_state[e_id], state=events_to_state[e_id],
backfilled=True, backfilled=True,
auth_events={ auth_events={
(e.type, e.state_key): e for e in auth_events (auth_events[a_id].type, auth_events[a_id].state_key):
if e.event_id in [a_id for a_id, _ in a.auth_events] auth_events[a_id]
} for a_id, _ in event_map[e_id].auth_events
},
) )
for e_id in events_to_state for e_id in events_to_state
], ],