From a7f20500ff39399634d4623e284fb2f9892776ae Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 4 Dec 2019 15:45:42 +0000
Subject: [PATCH] _CURRENT_STATE_CACHE_NAME is public

---
 synapse/replication/slave/storage/_base.py | 4 ++--
 synapse/storage/data_stores/main/cache.py  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synapse/replication/slave/storage/_base.py b/synapse/replication/slave/storage/_base.py
index 71e5877aca..6ece1d6745 100644
--- a/synapse/replication/slave/storage/_base.py
+++ b/synapse/replication/slave/storage/_base.py
@@ -19,7 +19,7 @@ from typing import Dict
 import six
 
 from synapse.storage._base import SQLBaseStore
-from synapse.storage.data_stores.main.cache import _CURRENT_STATE_CACHE_NAME
+from synapse.storage.data_stores.main.cache import CURRENT_STATE_CACHE_NAME
 from synapse.storage.engines import PostgresEngine
 
 from ._slaved_id_tracker import SlavedIdTracker
@@ -63,7 +63,7 @@ class BaseSlavedStore(SQLBaseStore):
         if stream_name == "caches":
             self._cache_id_gen.advance(token)
             for row in rows:
-                if row.cache_func == _CURRENT_STATE_CACHE_NAME:
+                if row.cache_func == CURRENT_STATE_CACHE_NAME:
                     room_id = row.keys[0]
                     members_changed = set(row.keys[1:])
                     self._invalidate_state_caches(room_id, members_changed)
diff --git a/synapse/storage/data_stores/main/cache.py b/synapse/storage/data_stores/main/cache.py
index 6efcc5f3b0..258c08722a 100644
--- a/synapse/storage/data_stores/main/cache.py
+++ b/synapse/storage/data_stores/main/cache.py
@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
 
 # This is a special cache name we use to batch multiple invalidations of caches
 # based on the current state when notifying workers over replication.
-_CURRENT_STATE_CACHE_NAME = "cs_cache_fake"
+CURRENT_STATE_CACHE_NAME = "cs_cache_fake"
 
 
 class CacheInvalidationStore(SQLBaseStore):
@@ -65,12 +65,12 @@ class CacheInvalidationStore(SQLBaseStore):
             for chunk in batch_iter(members_changed, 50):
                 keys = itertools.chain([room_id], chunk)
                 self._send_invalidation_to_replication(
-                    txn, _CURRENT_STATE_CACHE_NAME, keys
+                    txn, CURRENT_STATE_CACHE_NAME, keys
                 )
         else:
             # if no members changed, we still need to invalidate the other caches.
             self._send_invalidation_to_replication(
-                txn, _CURRENT_STATE_CACHE_NAME, [room_id]
+                txn, CURRENT_STATE_CACHE_NAME, [room_id]
             )
 
     def _send_invalidation_to_replication(self, txn, cache_name, keys):