summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-09-20 01:32:42 +0100
committerRichard van der Hoff <richard@matrix.org>2017-09-20 01:32:42 +0100
commitfcf2c0fd1aa4d85df0bdb43bc8411ad4ad988a6f (patch)
tree387ba8f90f6f85240f8789e618a2879b955a1c0a /synapse/federation
parentFix concurrent server_key requests (#2458) (diff)
downloadsynapse-fcf2c0fd1aa4d85df0bdb43bc8411ad4ad988a6f.tar.xz
Remove redundant `preserve_fn`
preserve_fn is a no-op unless the wrapped function returns a
Deferred. verify_json_objects_for_server returns a list, so this is doing
nothing.
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/federation_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py
index 28eaab2cef..cabed33f74 100644
--- a/synapse/federation/federation_base.py
+++ b/synapse/federation/federation_base.py
@@ -19,7 +19,7 @@ from synapse.crypto.event_signing import check_event_content_hash
 from synapse.events import spamcheck
 from synapse.events.utils import prune_event
 from synapse.util import unwrapFirstError
-from synapse.util.logcontext import preserve_context_over_deferred, preserve_fn
+from synapse.util.logcontext import preserve_context_over_deferred
 from twisted.internet import defer
 
 logger = logging.getLogger(__name__)
@@ -130,7 +130,7 @@ class FederationBase(object):
             for pdu in pdus
         ]
 
-        deferreds = preserve_fn(self.keyring.verify_json_objects_for_server)([
+        deferreds = self.keyring.verify_json_objects_for_server([
             (p.origin, p.get_pdu_json())
             for p in redacted_pdus
         ])