Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

remove unused and unnecessary check for FederationDeniedError #5645

Merged
merged 3 commits into from
Jul 9, 2019
Merged

remove unused and unnecessary check for FederationDeniedError #5645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4da1b60
remove unused and unnecessary check for FederationDeniedError
uhoreg Jul 8, 2019
8c4a81c
add changelog
uhoreg Jul 8, 2019
f0b4999
Merge branch 'develop' into uhoreg/remove_fed_denied_check
uhoreg Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5645.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unused and unnecessary check for FederationDeniedError in _exception_to_failure.
5 changes: 1 addition & 4 deletions synapse/handlers/e2e_keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down