From 9186c105a0d49c60582ff93cf108e511334c57fd Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 4 Dec 2019 15:46:19 +0000
Subject: [PATCH] Revert "Move get_user_count_txn out of base store"

This reverts commit 00f0d67566cdfe8eae44aeae1c982c42a255cfcd.

Its going to get removed soon, so lets not make merge conflicts.
---
 synapse/storage/_base.py                     | 12 ++++++++++++
 synapse/storage/data_stores/main/__init__.py | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 90019c8b0..c02248cfe 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -1440,6 +1440,18 @@ class SQLBaseStore(object):
 
         return cls.cursor_to_dict(txn)
 
+    def get_user_count_txn(self, txn):
+        """Get a total number of registered users in the users list.
+
+        Args:
+            txn : Transaction object
+        Returns:
+            int : number of users
+        """
+        sql_count = "SELECT COUNT(*) FROM users WHERE is_guest = 0;"
+        txn.execute(sql_count)
+        return txn.fetchone()[0]
+
     def _simple_search_list(
         self, table, term, col, retcols, desc="_simple_search_list"
     ):
diff --git a/synapse/storage/data_stores/main/__init__.py b/synapse/storage/data_stores/main/__init__.py
index 76315935d..474924c68 100644
--- a/synapse/storage/data_stores/main/__init__.py
+++ b/synapse/storage/data_stores/main/__init__.py
@@ -516,18 +516,6 @@ class DataStore(
         retval = {"users": users, "total": count}
         return retval
 
-    def get_user_count_txn(self, txn):
-        """Get a total number of registered users in the users list.
-
-        Args:
-            txn : Transaction object
-        Returns:
-            int : number of users
-        """
-        sql_count = "SELECT COUNT(*) FROM users WHERE is_guest = 0;"
-        txn.execute(sql_count)
-        return txn.fetchone()[0]
-
     def search_users(self, term):
         """Function to search users list for one or more users with
         the matched term.