summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-30 11:44:18 +0100
committerGitHub <noreply@github.com>2019-10-30 11:44:18 +0100
commit770d1ef6733cd2560b7bddbc6ec43ea72c95400d (patch)
tree1707085c2d3b3a6e283b6aefb6bc35a4319a541f /synapse/storage
parentMerge pull request #6274 from matrix-org/erikj/replication_async (diff)
parentMerge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s... (diff)
downloadsynapse-770d1ef6733cd2560b7bddbc6ec43ea72c95400d.tar.xz
Merge pull request #6280 from matrix-org/erikj/receipts_async_await
Port receipt and read markers to async/wait
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/data_stores/main/events.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py

index 03b5111c5d..067e77ae00 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py
@@ -2439,12 +2439,11 @@ class EventsStore( logger.info("[purge] done") - @defer.inlineCallbacks - def is_event_after(self, event_id1, event_id2): + async def is_event_after(self, event_id1, event_id2): """Returns True if event_id1 is after event_id2 in the stream """ - to_1, so_1 = yield self._get_event_ordering(event_id1) - to_2, so_2 = yield self._get_event_ordering(event_id2) + to_1, so_1 = await self._get_event_ordering(event_id1) + to_2, so_2 = await self._get_event_ordering(event_id2) return (to_1, so_1) > (to_2, so_2) @cachedInlineCallbacks(max_entries=5000)