From 3f1fe92a3bf5768b064b6da165220e721ff8b88f Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 2 Apr 2019 13:45:58 +0100 Subject: [PATCH] Shuffle config --- synapse/http/federation/matrix_federation_agent.py | 5 ++--- tests/http/federation/test_matrix_federation_agent.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py index 7c5df38f5f..b4cbe97b41 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py @@ -79,11 +79,10 @@ class MatrixFederationAgent(object): def __init__( self, reactor, tls_client_options_factory, - config, _well_known_tls_policy=None, + _well_known_tls_policy=None, _srv_resolver=None, _well_known_cache=well_known_cache, ): - self.config = config self._reactor = reactor self._clock = Clock(reactor) @@ -150,7 +149,7 @@ class MatrixFederationAgent(object): tls_options = None else: tls_options = self._tls_client_options_factory.get_options( - res.tls_server_name.decode("ascii"), self.config, + res.tls_server_name.decode("ascii"), ) # make sure that the Host header is set correctly diff --git a/tests/http/federation/test_matrix_federation_agent.py b/tests/http/federation/test_matrix_federation_agent.py index a942410492..0e732580cc 100644 --- a/tests/http/federation/test_matrix_federation_agent.py +++ b/tests/http/federation/test_matrix_federation_agent.py @@ -59,7 +59,6 @@ class MatrixFederationAgentTests(TestCase): self.agent = MatrixFederationAgent( reactor=self.reactor, tls_client_options_factory=ClientTLSOptionsFactory(config), - config=config, _well_known_tls_policy=TrustingTLSPolicyForHTTPS(), _srv_resolver=self.mock_resolver, _well_known_cache=self.well_known_cache,