summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-27 10:16:26 +0100
committerDavid Baker <dave@matrix.org>2015-04-27 10:16:26 +0100
commitf8152f2708cc0c476f5e1ec028a63ca632927eff (patch)
tree66dfcc2be49ff5eec6255f3c047d871374b0e7bb
parentpep8 (diff)
downloadsynapse-f8152f2708cc0c476f5e1ec028a63ca632927eff.tar.xz
rename db method to be more informative
-rwxr-xr-xsynapse/app/homeserver.py2
-rw-r--r--synapse/storage/registration.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 5f6cf4deeb..8da1a4bafc 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -244,7 +244,7 @@ class SynapseHomeServer(HomeServer):
 
     @defer.inlineCallbacks
     def post_startup_check(self):
-        all_users_native = yield self.get_datastore().all_users_on_domain(
+        all_users_native = yield self.get_datastore().are_all_users_on_domain(
             self.hostname
         )
         if not all_users_native:
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 697d487126..65ae58a39c 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -146,15 +146,15 @@ class RegistrationStore(SQLBaseStore):
         raise StoreError(404, "Token not found.")
 
     @defer.inlineCallbacks
-    def all_users_on_domain(self, domain):
+    def are_all_users_on_domain(self, domain):
         res = yield self.runInteraction(
-            "all_users_on_domain",
-            self._all_users_on_domain_txn,
+            "are_all_users_on_domain",
+            self._are_all_users_on_domain_txn,
             domain
         )
         defer.returnValue(res)
 
-    def _all_users_on_domain_txn(self, txn, domain):
+    def _are_all_users_on_domain_txn(self, txn, domain):
         sql = "SELECT COUNT(*) FROM users WHERE name NOT LIKE ?"
         pat = "%:" + domain
         cursor = txn.execute(sql, (pat,))