Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:16:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state

Browse source
This commit is contained in:
Mark Haines 2014-12-16 15:59:17 +00:00
parent 3c7857e49b
commit c3eae8a88c
6 changed files with 50 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
synapse/handlers/federation.py
View file

@ -17,7 +17,6 @@
from ._base import BaseHandler
from synapse.events.snapshot import EventContext
from synapse.events.utils import prune_event
from synapse.api.errors import (
AuthError, FederationError, SynapseError, StoreError,
@ -260,8 +259,7 @@ class FederationHandler(BaseHandler):
event = pdu
# FIXME (erikj): Not sure this actually works :/
context = EventContext()
yield self.state_handler.annotate_context_with_state(event, context)
context = yield self.state_handler.compute_event_context(event)
events.append((event, context))
@ -555,8 +553,7 @@ class FederationHandler(BaseHandler):
)
)
context = EventContext()
yield self.state_handler.annotate_context_with_state(event, context)
context = yield self.state_handler.compute_event_context(event)
yield self.store.persist_event(
event,
@ -688,11 +685,8 @@ class FederationHandler(BaseHandler):
event.event_id, event.signatures,
)
context = EventContext()
yield self.state_handler.annotate_context_with_state(
event,
context,
old_state=state
context = yield self.state_handler.compute_event_context(
event, old_state=state
)
logger.debug(