summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-16 14:08:02 +0000
committerErik Johnston <erik@matrix.org>2015-02-16 14:08:02 +0000
commit61385846510ceed1bff571dde1233a70e02b4748 (patch)
treeca2f652563cdfcf62889a4c3f58b3d3007cf822d /synapse
parentFix contrib/graph/graph2.py to handle FrozenDict (diff)
downloadsynapse-61385846510ceed1bff571dde1233a70e02b4748.tar.xz
Don't return anything from _handle_new_pdu, since we ignore the return value anyway
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/federation_server.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 9f5c98694c..7ca8d49c54 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -331,7 +331,6 @@ class FederationServer(FederationBase):
         )
         if already_seen:
             logger.debug("Already seen pdu %s", pdu.event_id)
-            defer.returnValue({})
             return
 
         # Check signature.
@@ -418,7 +417,7 @@ class FederationServer(FederationBase):
             except:
                 logger.warn("Failed to get state for event: %s", pdu.event_id)
 
-        ret = yield self.handler.on_receive_pdu(
+        yield self.handler.on_receive_pdu(
             origin,
             pdu,
             backfilled=False,
@@ -426,8 +425,6 @@ class FederationServer(FederationBase):
             auth_chain=auth_chain,
         )
 
-        defer.returnValue(ret)
-
     def __str__(self):
         return "<ReplicationLayer(%s)>" % self.server_name