From ef4680df2241637851bcabdc877fd9b8f972595b Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <olivier@librepush.net>
Date: Wed, 26 Aug 2020 21:01:48 +0100
Subject: [PATCH] Last successful stream ordering is about destinations

---
 synapse/federation/sender/per_destination_queue.py | 6 +++---
 synapse/storage/databases/main/transactions.py     | 4 ++--
 tests/federation/test_federation_catch_up.py       | 8 ++++----
 tests/handlers/test_typing.py                      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py
index 4c07d1f7fb..081e13f092 100644
--- a/synapse/federation/sender/per_destination_queue.py
+++ b/synapse/federation/sender/per_destination_queue.py
@@ -363,7 +363,7 @@ class PerDestinationQueue(object):
                         self._last_successful_stream_order = (
                             final_pdu.internal_metadata.stream_ordering
                         )
-                        await self._store.set_last_successful_stream_ordering(
+                        await self._store.set_destination_last_successful_stream_ordering(
                             self._destination, self._last_successful_stream_order
                         )
                 else:
@@ -441,7 +441,7 @@ class PerDestinationQueue(object):
     async def _catch_up_transmission_loop(self) -> None:
         if self._last_successful_stream_order is None:
             # first catch-up, so get from database
-            self._last_successful_stream_order = await self._store.get_last_successful_stream_ordering(
+            self._last_successful_stream_order = await self._store.get_destination_last_successful_stream_ordering(
                 self._destination
             )
 
@@ -529,7 +529,7 @@ class PerDestinationQueue(object):
             self._last_successful_stream_order = cast(
                 int, final_pdu.internal_metadata.stream_ordering
             )
-            await self._store.set_last_successful_stream_ordering(
+            await self._store.set_destination_last_successful_stream_ordering(
                 self._destination, self._last_successful_stream_order
             )
 
diff --git a/synapse/storage/databases/main/transactions.py b/synapse/storage/databases/main/transactions.py
index 052dffcd1b..7b4a85c9ea 100644
--- a/synapse/storage/databases/main/transactions.py
+++ b/synapse/storage/databases/main/transactions.py
@@ -265,7 +265,7 @@ class TransactionStore(SQLBaseStore):
             "_cleanup_transactions", _cleanup_transactions_txn
         )
 
-    async def get_last_successful_stream_ordering(
+    async def get_destination_last_successful_stream_ordering(
         self, destination: str
     ) -> Optional[int]:
         """
@@ -283,7 +283,7 @@ class TransactionStore(SQLBaseStore):
             desc="get_last_successful_stream_ordering",
         )
 
-    async def set_last_successful_stream_ordering(
+    async def set_destination_last_successful_stream_ordering(
         self, destination: str, last_successful_stream_ordering: int
     ) -> None:
         """
diff --git a/tests/federation/test_federation_catch_up.py b/tests/federation/test_federation_catch_up.py
index 1d4cbcfab1..573ca9974f 100644
--- a/tests/federation/test_federation_catch_up.py
+++ b/tests/federation/test_federation_catch_up.py
@@ -213,7 +213,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
         self.pump()
 
         lsso_1 = self.get_success(
-            self.hs.get_datastore().get_last_successful_stream_ordering("host2")
+            self.hs.get_datastore().get_destination_last_successful_stream_ordering("host2")
         )
 
         self.assertIsNone(
@@ -227,7 +227,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
         event_id_2 = self.helper.send(room, "rabbits!", tok=u1_token)["event_id"]
 
         lsso_2 = self.get_success(
-            self.hs.get_datastore().get_last_successful_stream_ordering("host2")
+            self.hs.get_datastore().get_destination_last_successful_stream_ordering("host2")
         )
         row_2 = self.get_destination_room(room)
 
@@ -286,7 +286,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
         event_2 = self.get_success(self.hs.get_datastore().get_event(event_id_2))
 
         self.get_success(
-            self.hs.get_datastore().set_last_successful_stream_ordering(
+            self.hs.get_datastore().set_destination_last_successful_stream_ordering(
                 "host2", event_2.internal_metadata.stream_ordering
             )
         )
@@ -349,7 +349,7 @@ class FederationCatchUpTestCases(FederatingHomeserverTestCase):
         event_2 = self.get_success(self.hs.get_datastore().get_event(event_id_2))
 
         self.get_success(
-            self.hs.get_datastore().set_last_successful_stream_ordering(
+            self.hs.get_datastore().set_destination_last_successful_stream_ordering(
                 "host2", event_2.internal_metadata.stream_ordering
             )
         )
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 9b3d034e2d..228f4e68fa 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -161,7 +161,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
             None
         )
 
-        self.datastore.get_last_successful_stream_ordering = lambda *args, **kwargs: defer.succeed(
+        self.datastore.get_destination_last_successful_stream_ordering = lambda *args, **kwargs: defer.succeed(
             None
         )