Merge remote-tracking branch 'origin/develop' into erikj/ss_room_store

1 files changed, 5 insertions, 5 deletions

diff --git a/synapse/types/__init__.py b/synapse/types/__init__.py

index a99f5d1a92..5259550f1c 100644
--- a/synapse/types/__init__.py
+++ b/synapse/types/__init__.py
@@ -1170,9 +1170,9 @@ class SlidingSyncStreamToken:
         5/s2633508_17_338_6732159_1082514_541479_274711_265584_1_379
 
     Attributes:
-        stream: Token representing the position of all the standard
+        stream_token: Token representing the position of all the standard
             streams.
-        connection: Token used by sliding sync to track updates to any
+        connection_position: Token used by sliding sync to track updates to any
             per-connection state stored by Synapse.
     """
 
@@ -1184,13 +1184,13 @@ class SlidingSyncStreamToken:
     async def from_string(store: "DataStore", string: str) -> "SlidingSyncStreamToken":
         """Creates a SlidingSyncStreamToken from its textual representation."""
         try:
-            connection_token_str, stream_token_str = string.split("/", 1)
-            connection_token = int(connection_token_str)
+            connection_position_str, stream_token_str = string.split("/", 1)
+            connection_position = int(connection_position_str)
             stream_token = await StreamToken.from_string(store, stream_token_str)
 
             return SlidingSyncStreamToken(
                 stream_token=stream_token,
-                connection_position=connection_token,
+                connection_position=connection_position,
             )
         except CancelledError:
             raise