remove unused and unnecessary check for FederationDeniedError (#5645)

matrix-org · Feb 17, 2020 · 69cdd59 · 69cdd59
2 parents 748ebe2 + 7b3bc75
commit 69cdd59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/changelog.d/5645.misc b/changelog.d/5645.misc
@@ -0,0 +1 @@
+Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure.
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py
@@ -22,7 +22,7 @@
 
 from twisted.internet import defer
 
-from synapse.api.errors import CodeMessageException, FederationDeniedError, SynapseError
+from synapse.api.errors import CodeMessageException, SynapseError
 from synapse.logging.context import make_deferred_yieldable, run_in_background
 from synapse.types import UserID, get_domain_from_id
 from synapse.util.retryutils import NotRetryingDestination
@@ -350,9 +350,6 @@ def _exception_to_failure(e):
     if isinstance(e, NotRetryingDestination):
         return {"status": 503, "message": "Not ready for retry"}
 
-    if isinstance(e, FederationDeniedError):
-        return {"status": 403, "message": "Federation Denied"}
-
     # include ConnectionRefused and other errors
     #
     # Note that some Exceptions (notably twisted's ResponseFailed etc) don't
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure.