diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-06-07 16:18:57 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-06-12 09:51:31 +0100 |
| commit | 9fc5b74b24314cc41d8cf54ab73ca8107b1342b4 (patch) | |
| tree | c900b7c82783fdf4c8baf54f5ea5bea88e290a68 /synapse/federation/federation_server.py | |
| parent | remove dead filter_events_for_clients (diff) | |
| download | synapse-9fc5b74b24314cc41d8cf54ab73ca8107b1342b4.tar.xz | |
simplify get_persisted_pdu
it doesn't make much sense to use get_persisted_pdu on the receive path: just get the event straight from the store.
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 2d420a58a2..d4dd967c60 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -277,7 +277,7 @@ class FederationServer(FederationBase): @defer.inlineCallbacks @log_function def on_pdu_request(self, origin, event_id): - pdu = yield self._get_persisted_pdu(origin, event_id) + pdu = yield self.handler.get_persisted_pdu(origin, event_id) if pdu: defer.returnValue( @@ -470,17 +470,6 @@ class FederationServer(FederationBase): ts_now_ms = self._clock.time_msec() return self.store.get_user_id_for_open_id_token(token, ts_now_ms) - @log_function - def _get_persisted_pdu(self, origin, event_id, do_auth=True): - """ Get a PDU from the database with given origin and id. - - Returns: - Deferred: Results in a `Pdu`. - """ - return self.handler.get_persisted_pdu( - origin, event_id, do_auth=do_auth - ) - def _transaction_from_pdus(self, pdu_list): """Returns a new Transaction containing the given PDUs suitable for transmission. |