summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-30 14:11:31 +0000
committerErik Johnston <erik@matrix.org>2017-01-30 14:11:31 +0000
commit3670025e641e338de14a012a24d0ceb1cade194c (patch)
tree12662c4133d36045435dd066b8e3ca448f2b2a3b /synapse
parentRemove debug logging (diff)
downloadsynapse-3670025e641e338de14a012a24d0ceb1cade194c.tar.xz
Rename func
Diffstat (limited to 'synapse')
-rw-r--r--synapse/replication/resource.py2
-rw-r--r--synapse/storage/devices.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py
index 36548c5eda..a30e647474 100644
--- a/synapse/replication/resource.py
+++ b/synapse/replication/resource.py
@@ -506,7 +506,7 @@ class ReplicationResource(Resource):
         device_lists = request_streams.get("device_lists")
 
         if device_lists is not None and device_lists != current_position:
-            changes = yield self.store.get_users_and_hosts_device_list_changes(
+            changes = yield self.store.get_all_device_list_changes_for_remotes(
                 device_lists,
             )
             writer.write_header_and_rows("device_lists", changes, (
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index c05ca7c5e0..e68ee50152 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -465,7 +465,7 @@ class DeviceStore(SQLBaseStore):
         rows = yield self._execute("get_user_whose_devices_changed", None, sql, from_key)
         defer.returnValue(set(row["user_id"] for row in rows))
 
-    def get_users_and_hosts_device_list_changes(self, from_key):
+    def get_all_device_list_changes_for_remotes(self, from_key):
         """Return a list of `(stream_id, user_id, destination)` which is the
         combined list of changes to devices, and which destinations need to be
         poked. `destination` may be None if no destinations need to be poked.