summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-29 19:15:23 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-29 19:15:23 +0100
commita8e8d1d06c078de49711768357267cf4168999ea (patch)
treefa449b133e1780611f5de9c258c95a6cdf771492 /synapse/streams
parentHave EventSource's get_new_events_for_user() API work only on keys within tha... (diff)
downloadsynapse-a8e8d1d06c078de49711768357267cf4168999ea.tar.xz
Renamed get_current_token_part to get_current_key
Diffstat (limited to 'synapse/streams')
-rw-r--r--synapse/streams/events.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index 43b6b1eba3..08d6e6f733 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -31,7 +31,7 @@ class NullSource(object):
     def get_new_events_for_user(self, user, from_key, limit):
         return defer.succeed(([], from_key))
 
-    def get_current_token_part(self):
+    def get_current_key(self):
         return defer.succeed(0)
 
     def get_pagination_rows(self, user, pagination_config, key):
@@ -55,13 +55,13 @@ class EventSources(object):
     def get_current_token(self):
         token = StreamToken(
             room_key=(
-                yield self.sources["room"].get_current_token_part()
+                yield self.sources["room"].get_current_key()
             ),
             presence_key=(
-                yield self.sources["presence"].get_current_token_part()
+                yield self.sources["presence"].get_current_key()
             ),
             typing_key=(
-                yield self.sources["typing"].get_current_token_part()
+                yield self.sources["typing"].get_current_key()
             )
         )
         defer.returnValue(token)
@@ -72,8 +72,8 @@ class StreamSource(object):
         """from_key is the key within this event source."""
         raise NotImplementedError("get_new_events_for_user")
 
-    def get_current_token_part(self):
-        raise NotImplementedError("get_current_token_part")
+    def get_current_key(self):
+        raise NotImplementedError("get_current_key")
 
     def get_pagination_rows(self, user, pagination_config, key):
         raise NotImplementedError("get_rows")