Skip to content
Snippets Groups Projects
Unverified Commit c99da2d0 authored by David Robertson's avatar David Robertson Committed by GitHub
Browse files

Annotations for user_erasure_store (#11313)

I'm not sure why this was excluded---it seemed to be passing for me. But
it's easy enough to fixup.
parent 6a605f4a
No related branches found
No related tags found
No related merge requests found
Add type hints to storage classes.
...@@ -53,7 +53,6 @@ exclude = (?x) ...@@ -53,7 +53,6 @@ exclude = (?x)
|synapse/storage/databases/main/stats.py |synapse/storage/databases/main/stats.py
|synapse/storage/databases/main/transactions.py |synapse/storage/databases/main/transactions.py
|synapse/storage/databases/main/user_directory.py |synapse/storage/databases/main/user_directory.py
|synapse/storage/databases/main/user_erasure_store.py
|synapse/storage/schema/ |synapse/storage/schema/
|tests/api/test_auth.py |tests/api/test_auth.py
...@@ -184,6 +183,9 @@ disallow_untyped_defs = True ...@@ -184,6 +183,9 @@ disallow_untyped_defs = True
[mypy-synapse.storage.databases.main.room_batch] [mypy-synapse.storage.databases.main.room_batch]
disallow_untyped_defs = True disallow_untyped_defs = True
[mypy-synapse.storage.databases.main.user_erasure_store]
disallow_untyped_defs = True
[mypy-synapse.storage.util.*] [mypy-synapse.storage.util.*]
disallow_untyped_defs = True disallow_untyped_defs = True
......
...@@ -14,11 +14,12 @@ ...@@ -14,11 +14,12 @@
from typing import Dict, Iterable from typing import Dict, Iterable
from synapse.storage._base import SQLBaseStore from synapse.storage.database import LoggingTransaction
from synapse.storage.databases.main import CacheInvalidationWorkerStore
from synapse.util.caches.descriptors import cached, cachedList from synapse.util.caches.descriptors import cached, cachedList
class UserErasureWorkerStore(SQLBaseStore): class UserErasureWorkerStore(CacheInvalidationWorkerStore):
@cached() @cached()
async def is_user_erased(self, user_id: str) -> bool: async def is_user_erased(self, user_id: str) -> bool:
""" """
...@@ -69,7 +70,7 @@ class UserErasureStore(UserErasureWorkerStore): ...@@ -69,7 +70,7 @@ class UserErasureStore(UserErasureWorkerStore):
user_id: full user_id to be erased user_id: full user_id to be erased
""" """
def f(txn): def f(txn: LoggingTransaction) -> None:
# first check if they are already in the list # first check if they are already in the list
txn.execute("SELECT 1 FROM erased_users WHERE user_id = ?", (user_id,)) txn.execute("SELECT 1 FROM erased_users WHERE user_id = ?", (user_id,))
if txn.fetchone(): if txn.fetchone():
...@@ -89,7 +90,7 @@ class UserErasureStore(UserErasureWorkerStore): ...@@ -89,7 +90,7 @@ class UserErasureStore(UserErasureWorkerStore):
user_id: full user_id to be un-erased user_id: full user_id to be un-erased
""" """
def f(txn): def f(txn: LoggingTransaction) -> None:
# first check if they are already in the list # first check if they are already in the list
txn.execute("SELECT 1 FROM erased_users WHERE user_id = ?", (user_id,)) txn.execute("SELECT 1 FROM erased_users WHERE user_id = ?", (user_id,))
if not txn.fetchone(): if not txn.fetchone():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment