diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 12751fd8c0..2d3b8ba73c 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -339,7 +339,7 @@ class SyncHandler(object):
room_ids = sync_result_builder.joined_room_ids
typing_source = self.event_sources.sources["typing"]
- typing, typing_key = typing_source.get_new_events(
+ typing, typing_key = await typing_source.get_new_events(
user=sync_config.user,
from_key=typing_key,
limit=sync_config.filter_collection.ephemeral_limit(),
@@ -1013,7 +1013,7 @@ class SyncHandler(object):
now_token = sync_result_builder.now_token
if since_token and since_token.groups_key:
- results = self.store.get_groups_changes_for_user(
+ results = await self.store.get_groups_changes_for_user(
user_id, since_token.groups_key, now_token.groups_key
)
else:
@@ -1197,7 +1197,7 @@ class SyncHandler(object):
(
account_data,
account_data_by_room,
- ) = self.store.get_updated_account_data_for_user(
+ ) = await self.store.get_updated_account_data_for_user(
user_id, since_token.account_data_key
)
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 856337b7e2..6f78454322 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -313,7 +313,7 @@ class TypingNotificationEventSource(object):
events.append(self._make_event_for(room_id))
- return events, handler._latest_room_serial
+ return defer.succeed((events, handler._latest_room_serial))
def get_current_key(self):
return self.get_typing_handler()._latest_room_serial
diff --git a/synapse/storage/data_stores/main/account_data.py b/synapse/storage/data_stores/main/account_data.py
index b0d22faf3f..ed97b3ffe5 100644
--- a/synapse/storage/data_stores/main/account_data.py
+++ b/synapse/storage/data_stores/main/account_data.py
@@ -250,7 +250,7 @@ class AccountDataWorkerStore(SQLBaseStore):
user_id, int(stream_id)
)
if not changed:
- return {}, {}
+ return defer.succeed(({}, {}))
return self.runInteraction(
"get_updated_account_data_for_user", get_updated_account_data_for_user_txn
diff --git a/synapse/storage/data_stores/main/group_server.py b/synapse/storage/data_stores/main/group_server.py
index 9e1d12bcb7..d29155a3b5 100644
--- a/synapse/storage/data_stores/main/group_server.py
+++ b/synapse/storage/data_stores/main/group_server.py
@@ -1109,7 +1109,7 @@ class GroupServerStore(SQLBaseStore):
user_id, from_token
)
if not has_changed:
- return []
+ return defer.succeed([])
def _get_groups_changes_for_user_txn(txn):
sql = """
@@ -1139,7 +1139,7 @@ class GroupServerStore(SQLBaseStore):
from_token
)
if not has_changed:
- return []
+ return defer.succeed([])
def _get_all_groups_changes_txn(txn):
sql = """
|
