diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-14 18:27:37 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-14 18:27:37 +1000 |
commit | a61738b316db70a4184d5c355696e0a039e7867f (patch) | |
tree | caca1a3ef0267aad2827f2f46755161d41f2ad5a /synapse/rest/client/v1 | |
parent | Merge pull request #3368 from matrix-org/rav/fix_federation_client_host (diff) | |
download | synapse-a61738b316db70a4184d5c355696e0a039e7867f.tar.xz |
Remove run_on_reactor (#3395)
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r-- | synapse/rest/client/v1/register.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py index 9b3022e0b0..c10320dedf 100644 --- a/synapse/rest/client/v1/register.py +++ b/synapse/rest/client/v1/register.py @@ -24,8 +24,6 @@ import synapse.util.stringutils as stringutils from synapse.http.servlet import parse_json_object_from_request from synapse.types import create_requester -from synapse.util.async import run_on_reactor - from hashlib import sha1 import hmac import logging @@ -272,7 +270,6 @@ class RegisterRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def _do_password(self, request, register_json, session): - yield run_on_reactor() if (self.hs.config.enable_registration_captcha and not session[LoginType.RECAPTCHA]): # captcha should've been done by this stage! @@ -333,8 +330,6 @@ class RegisterRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def _do_shared_secret(self, request, register_json, session): - yield run_on_reactor() - if not isinstance(register_json.get("mac", None), string_types): raise SynapseError(400, "Expected mac.") if not isinstance(register_json.get("user", None), string_types): @@ -423,8 +418,6 @@ class CreateUserRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def _do_create(self, requester, user_json): - yield run_on_reactor() - if "localpart" not in user_json: raise SynapseError(400, "Expected 'localpart' key.") |