Fold federation/handler into handlers/federation

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py

index a726b7346b..130387184f 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -60,7 +60,9 @@ class DataStore(RoomMemberStore, RoomStore,
     def persist_event(self, event=None, backfilled=False, pdu=None):
         # FIXME (erikj): This should be removed when we start amalgamating
         # event and pdu storage
-        yield self.hs.get_federation().fill_out_prev_events(event)
+        if event is not None:
+            federation_handler = self.hs.get_handlers().federation_handler
+            yield federation_handler.fill_out_prev_events(event)
 
         stream_ordering = None
         if backfilled: