summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:35:42 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:35:42 +0000
commite15b1fd55ceb96999971dc170e1870f29f0af5c0 (patch)
tree5e7d2d8d30e01f09d2ddfd7e546dccaf6a0e3ef7 /synapse/storage
parentMerge pull request #6274 from matrix-org/erikj/replication_async (diff)
parentMerge pull request #6280 from matrix-org/erikj/receipts_async_await (diff)
downloadsynapse-e15b1fd55ceb96999971dc170e1870f29f0af5c0.tar.xz
Merge pull request #6280 from matrix-org/erikj/receipts_async_await
* commit '770d1ef67':
  Newsfile
  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 58fa7dfb79..28c0ccda3b 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py
@@ -2442,12 +2442,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)