From 450ec4844599b6f06ff6c699a8edc067fa7d4217 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 28 Sep 2020 13:15:00 +0100
Subject: [PATCH] A pair of tiny cleanups in the federation request code.
 (#8401)

---
 changelog.d/8401.misc                  | 1 +
 synapse/handlers/federation.py         | 2 +-
 synapse/http/matrixfederationclient.py | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/8401.misc

diff --git a/changelog.d/8401.misc b/changelog.d/8401.misc
new file mode 100644
index 000000000..27fd7ab12
--- /dev/null
+++ b/changelog.d/8401.misc
@@ -0,0 +1 @@
+A pair of tiny cleanups in the federation request code.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 9f773aefa..5bcfb231b 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -281,7 +281,7 @@ class FederationHandler(BaseHandler):
                             raise Exception(
                                 "Error fetching missing prev_events for %s: %s"
                                 % (event_id, e)
-                            )
+                            ) from e
 
                         # Update the set of things we've seen after trying to
                         # fetch the missing stuff
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 3c86cbc54..b02c74ab2 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -473,8 +473,6 @@ class MatrixFederationHttpClient:
                             )
 
                             response = await request_deferred
-                    except TimeoutError as e:
-                        raise RequestSendFailed(e, can_retry=True) from e
                     except DNSLookupError as e:
                         raise RequestSendFailed(e, can_retry=retry_on_dns_fail) from e
                     except Exception as e: