cleanup

3 files changed, 6 insertions, 7 deletions

diff --git a/zenserver/upstream/upstreamapply.h b/zenserver/upstream/upstreamapply.h
index 2edc6dc49..1deaf00a5 100644
--- a/zenserver/upstream/upstreamapply.h
+++ b/zenserver/upstream/upstreamapply.h
@@ -23,7 +23,7 @@ class CbObjectWriter;
 class CidStore;
 class CloudCacheTokenProvider;
 class WorkerThreadPool;
-class ZenCacheStore;
+class ZenCacheNamespace;
 struct CloudCacheClientOptions;
 struct UpstreamAuthConfig;
 
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index 49f384774..c89227106 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -19,7 +19,6 @@
 #include <zenstore/cidstore.h>
 
 #include <auth/authmgr.h>
-#include "cache/namespacecachestore.h"
 #include "cache/structuredcache.h"
 #include "cache/structuredcachestore.h"
 #include "diag/logging.h"
@@ -1174,7 +1173,7 @@ namespace detail {
 class UpstreamCacheImpl final : public UpstreamCache
 {
 public:
-	UpstreamCacheImpl(const UpstreamCacheOptions& Options, NamespaceCacheStore& CacheStore, CidStore& CidStore)
+	UpstreamCacheImpl(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore)
 	: m_Log(logging::Get("upstream"))
 	, m_Options(Options)
 	, m_CacheStore(CacheStore)
@@ -1688,7 +1687,7 @@ private:
 
 	spdlog::logger&								   m_Log;
 	UpstreamCacheOptions						   m_Options;
-	NamespaceCacheStore&						   m_CacheStore;
+	ZenCacheStore&								   m_CacheStore;
 	CidStore&									   m_CidStore;
 	UpstreamQueue								   m_UpstreamQueue;
 	std::shared_mutex							   m_EndpointsMutex;
@@ -1713,7 +1712,7 @@ UpstreamEndpoint::CreateJupiterEndpoint(const CloudCacheClientOptions& Options,
 }
 
 std::unique_ptr<UpstreamCache>
-UpstreamCache::Create(const UpstreamCacheOptions& Options, NamespaceCacheStore& CacheStore, CidStore& CidStore)
+UpstreamCache::Create(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore)
 {
 	return std::make_unique<UpstreamCacheImpl>(Options, CacheStore, CidStore);
 }
diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h
index 54386e80d..6f18b3119 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/zenserver/upstream/upstreamcache.h
@@ -24,7 +24,7 @@ class CbObjectView;
 class CbPackage;
 class CbObjectWriter;
 class CidStore;
-class NamespaceCacheStore;
+class ZenCacheStore;
 struct CloudCacheClientOptions;
 class CloudCacheTokenProvider;
 struct ZenStructuredCacheClientOptions;
@@ -206,7 +206,7 @@ public:
 
 	virtual void GetStatus(CbObjectWriter& CbO) = 0;
 
-	static std::unique_ptr<UpstreamCache> Create(const UpstreamCacheOptions& Options, NamespaceCacheStore& CacheStore, CidStore& CidStore);
+	static std::unique_ptr<UpstreamCache> Create(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore);
 };
 
 }  // namespace zen