diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-08-02 18:06:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-08-02 18:12:00 +0100 |
| commit | 1efee2f52b931ddcd90e87d06c7ea614da2c9cd0 (patch) | |
| tree | afd7d79065972cc5bacd47f872cab3ec79e94def /synapse/federation/transport | |
| parent | Move e2e query logic into a handler (diff) | |
| download | synapse-1efee2f52b931ddcd90e87d06c7ea614da2c9cd0.tar.xz | |
E2E keys: Make federation query share code with client query
Refactor the e2e query handler to separate out the local query, and then make the federation handler use it.
Diffstat (limited to 'synapse/federation/transport')
| -rw-r--r-- | synapse/federation/transport/server.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 26fa88ae84..1a88413d18 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -367,10 +367,8 @@ class FederationThirdPartyInviteExchangeServlet(BaseFederationServlet): class FederationClientKeysQueryServlet(BaseFederationServlet): PATH = "/user/keys/query" - @defer.inlineCallbacks def on_POST(self, origin, content, query): - response = yield self.handler.on_query_client_keys(origin, content) - defer.returnValue((200, response)) + return self.handler.on_query_client_keys(origin, content) class FederationClientKeysClaimServlet(BaseFederationServlet): |