Moved more code into zen namespace, for consistency

Also removed snapshot_manifest (remnants of vfs prototype)

3 files changed, 19 insertions, 20 deletions

diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index ecd540445..5b7680be2 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -94,7 +94,7 @@ namespace detail {
 		std::atomic_bool		m_CompleteAdding{false};
 	};
 
-	class JupiterUpstreamEndpoint final : public zen::UpstreamEndpoint
+	class JupiterUpstreamEndpoint final : public UpstreamEndpoint
 	{
 	public:
 		JupiterUpstreamEndpoint(const CloudCacheClientOptions& Options) : m_UseLegacyDdc(Options.UseLegacyDdc)
@@ -108,7 +108,7 @@ namespace detail {
 
 		virtual bool Initialize() override
 		{
-			zen::CloudCacheSession Session(m_Client);
+			CloudCacheSession Session(m_Client);
 			const CloudCacheResult Result = Session.Authenticate();
 			return Result.Success;
 		}
@@ -119,7 +119,7 @@ namespace detail {
 		{
 			try
 			{
-				zen::CloudCacheSession Session(m_Client);
+				CloudCacheSession Session(m_Client);
 				CloudCacheResult	   Result;
 
 				if (m_UseLegacyDdc && Type == ZenContentType::kBinary)
@@ -135,7 +135,7 @@ namespace detail {
 					{
 						CbPackage Package;
 
-						const CbValidateError ValidationResult = zen::ValidateCompactBinary(Result.Response, CbValidateMode::All);
+						const CbValidateError ValidationResult = ValidateCompactBinary(Result.Response, CbValidateMode::All);
 						if (Result.Success = ValidationResult == CbValidateError::None; Result.Success)
 						{
 							CbObject CacheRecord = LoadCompactBinaryObject(Result.Response);
@@ -184,7 +184,7 @@ namespace detail {
 		{
 			try
 			{
-				zen::CloudCacheSession Session(m_Client);
+				CloudCacheSession Session(m_Client);
 				const CloudCacheResult Result = Session.GetCompressedBlob(PayloadKey.PayloadId);
 
 				return {.Value			= Result.Response,
@@ -279,7 +279,7 @@ namespace detail {
 		RefPtr<CloudCacheClient> m_Client;
 	};
 
-	class ZenUpstreamEndpoint final : public zen::UpstreamEndpoint
+	class ZenUpstreamEndpoint final : public UpstreamEndpoint
 	{
 	public:
 		ZenUpstreamEndpoint(std::string_view ServiceUrl)
@@ -357,14 +357,14 @@ namespace detail {
 
 			try
 			{
-				zen::ZenStructuredCacheSession Session(*m_Client);
+				ZenStructuredCacheSession Session(*m_Client);
 				ZenCacheResult				   Result;
 				int64_t						   TotalBytes		   = 0ull;
 				double						   TotalElapsedSeconds = 0.0;
 
 				if (CacheRecord.Type == ZenContentType::kCbPackage)
 				{
-					zen::CbPackage Package;
+					CbPackage Package;
 					Package.SetObject(CbObject(SharedBuffer(RecordValue)));
 
 					for (const IoBuffer& Payload : Payloads)
@@ -441,7 +441,7 @@ namespace detail {
 
 	private:
 		std::string							  m_DisplayName;
-		RefPtr<zen::ZenStructuredCacheClient> m_Client;
+		RefPtr<ZenStructuredCacheClient> m_Client;
 	};
 
 }  // namespace detail
@@ -468,7 +468,7 @@ class UpstreamStats final
 	};
 
 public:
-	UpstreamStats() : m_Log(zen::logging::Get("upstream")) {}
+	UpstreamStats() : m_Log(logging::Get("upstream")) {}
 
 	void Add(const UpstreamEndpoint& Endpoint, const GetUpstreamCacheResult& Result)
 	{
@@ -536,8 +536,8 @@ private:
 class DefaultUpstreamCache final : public UpstreamCache
 {
 public:
-	DefaultUpstreamCache(const UpstreamCacheOptions& Options, ::ZenCacheStore& CacheStore, CidStore& CidStore)
-	: m_Log(zen::logging::Get("upstream"))
+	DefaultUpstreamCache(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore)
+	: m_Log(logging::Get("upstream"))
 	, m_Options(Options)
 	, m_CacheStore(CacheStore)
 	, m_CidStore(CidStore)
@@ -718,11 +718,11 @@ private:
 
 	spdlog::logger&										m_Log;
 	UpstreamCacheOptions								m_Options;
-	::ZenCacheStore&									m_CacheStore;
+	ZenCacheStore&										m_CacheStore;
 	CidStore&											m_CidStore;
 	UpstreamQueue										m_UpstreamQueue;
 	UpstreamStats										m_Stats;
-	std::vector<std::unique_ptr<zen::UpstreamEndpoint>> m_Endpoints;
+	std::vector<std::unique_ptr<UpstreamEndpoint>> m_Endpoints;
 	std::vector<std::thread>							m_UpstreamThreads;
 	std::atomic_bool									m_IsRunning{false};
 };
@@ -730,7 +730,7 @@ private:
 //////////////////////////////////////////////////////////////////////////
 
 std::unique_ptr<UpstreamCache>
-MakeUpstreamCache(const UpstreamCacheOptions& Options, ::ZenCacheStore& CacheStore, CidStore& CidStore)
+MakeUpstreamCache(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore)
 {
 	return std::make_unique<DefaultUpstreamCache>(Options, CacheStore, CidStore);
 }
diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h
index 3b054d815..142fe260f 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/zenserver/upstream/upstreamcache.h
@@ -8,11 +8,10 @@
 
 #include <memory>
 
-class ZenCacheStore;
-
 namespace zen {
 
 class CidStore;
+class ZenCacheStore;
 struct CloudCacheClientOptions;
 
 struct UpstreamCacheKey
@@ -103,7 +102,7 @@ public:
 	virtual EnqueueResult EnqueueUpstream(UpstreamCacheRecord CacheRecord) = 0;
 };
 
-std::unique_ptr<UpstreamCache> MakeUpstreamCache(const UpstreamCacheOptions& Options, ::ZenCacheStore& CacheStore, CidStore& CidStore);
+std::unique_ptr<UpstreamCache> MakeUpstreamCache(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore);
 
 std::unique_ptr<UpstreamEndpoint> MakeJupiterUpstreamEndpoint(const CloudCacheClientOptions& Options);
 
diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp
index be4daa30a..7f689d7f3 100644
--- a/zenserver/upstream/zen.cpp
+++ b/zenserver/upstream/zen.cpp
@@ -73,7 +73,7 @@ namespace detail {
 
 // Note that currently this just implements an UDP echo service for testing purposes
 
-Mesh::Mesh(asio::io_context& IoContext) : m_Log(logging::Get("mesh")), m_IoContext(IoContext), m_SessionId(zen::GetSessionId())
+Mesh::Mesh(asio::io_context& IoContext) : m_Log(logging::Get("mesh")), m_IoContext(IoContext), m_SessionId(GetSessionId())
 {
 }
 
@@ -370,7 +370,7 @@ ZenStructuredCacheClient::FreeSessionState(detail::ZenCacheSessionState* State)
 using namespace std::literals;
 
 ZenStructuredCacheSession::ZenStructuredCacheSession(ZenStructuredCacheClient& OuterClient)
-: m_Log(zen::logging::Get("zenclient"sv))
+: m_Log(logging::Get("zenclient"sv))
 , m_Client(OuterClient)
 {
 	m_SessionState = m_Client.AllocSessionState();