Delete old, unused methods and rename new one to just be `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin.

2 files changed, 3 insertions, 16 deletions

diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 0f02493fa2..43f2cdc2c4 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -438,7 +438,7 @@ class AuthHandler(BaseHandler):
         except_access_token_ids = [requester.access_token_id] if requester else []
 
         yield self.store.user_set_password_hash(user_id, password_hash)
-        yield self.store.user_delete_access_tokens_except(
+        yield self.store.user_delete_access_tokens(
             user_id, except_access_token_ids
         )
         yield self.hs.get_pusherpool().remove_pushers_by_user_except_access_tokens(
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index d3d84c9b94..266e29f5bc 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -195,20 +195,7 @@ class RegistrationStore(SQLBaseStore):
         })
 
     @defer.inlineCallbacks
-    def user_delete_access_tokens(self, user_id):
-        yield self.runInteraction(
-            "user_delete_access_tokens",
-            self._user_delete_access_tokens, user_id
-        )
-
-    def _user_delete_access_tokens(self, txn, user_id):
-        txn.execute(
-            "DELETE FROM access_tokens WHERE user_id = ?",
-            (user_id, )
-        )
-
-    @defer.inlineCallbacks
-    def user_delete_access_tokens_except(self, user_id, except_token_ids):
+    def user_delete_access_tokens(self, user_id, except_token_ids):
         def f(txn):
             txn.execute(
                 "SELECT id, token FROM access_tokens WHERE user_id = ? LIMIT 50",
@@ -226,7 +213,7 @@ class RegistrationStore(SQLBaseStore):
                 ), [r[0] for r in rows]
             )
             return len(rows) == 50
-        while (yield self.runInteraction("user_delete_access_tokens_except", f)):
+        while (yield self.runInteraction("user_delete_access_tokens", f)):
             pass
 
     @cached()