Minor cleanup of free functions.

1 files changed, 10 insertions, 8 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 03d59ba7c..56713e0ac 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -212,7 +212,7 @@ public:
 											  .IV  = IoBufferBuilder::MakeCloneFromMemory(MakeMemoryView(ServerOptions.EncryptionIV))};
 		};
 
-		m_AuthMgr	  = MakeAuthMgr({.RootDirectory = m_DataRoot / "auth", .EncryptionKey = EncryptionKey});
+		m_AuthMgr	  = AuthMgr::Create({.RootDirectory = m_DataRoot / "auth", .EncryptionKey = EncryptionKey});
 		m_AuthService = std::make_unique<zen::HttpAuthService>(*m_AuthMgr);
 		m_Http->RegisterService(*m_AuthService);
 
@@ -709,7 +709,7 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 		UpstreamOptions.ThreadCount = static_cast<uint32_t>(UpstreamConfig.UpstreamThreadCount);
 	}
 
-	m_UpstreamCache	  = zen::MakeUpstreamCache(UpstreamOptions, *m_CacheStore, *m_CidStore);
+	m_UpstreamCache	  = zen::UpstreamCache::Create(UpstreamOptions, *m_CacheStore, *m_CidStore);
 	m_UpstreamService = std::make_unique<HttpUpstreamService>(*m_UpstreamCache, *m_AuthMgr);
 	m_UpstreamCache->Initialize();
 
@@ -739,11 +739,12 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 			{
 				const auto ZenEndpointName = UpstreamConfig.ZenConfig.Name.empty() ? "Zen"sv : UpstreamConfig.ZenConfig.Name;
 
-				std::unique_ptr<zen::UpstreamEndpoint> ZenEndpoint =
-					zen::MakeZenUpstreamEndpoint({.Name			  = ZenEndpointName,
-												  .Urls			  = ZenUrls,
-												  .ConnectTimeout = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds),
-												  .Timeout		  = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds)});
+				std::unique_ptr<zen::UpstreamEndpoint> ZenEndpoint = zen::UpstreamEndpoint::CreateZenEndpoint(
+					{.Name			 = ZenEndpointName,
+					 .Urls			 = ZenUrls,
+					 .ConnectTimeout = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds),
+					 .Timeout		 = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds)});
+
 				m_UpstreamCache->RegisterEndpoint(std::move(ZenEndpoint));
 			}
 		}
@@ -767,7 +768,8 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 													  .OpenIdProvider	 = UpstreamConfig.JupiterConfig.OpenIdProvider,
 													  .AccessToken		 = UpstreamConfig.JupiterConfig.AccessToken};
 
-			std::unique_ptr<zen::UpstreamEndpoint> JupiterEndpoint = zen::MakeJupiterUpstreamEndpoint(Options, AuthConfig, *m_AuthMgr);
+			std::unique_ptr<zen::UpstreamEndpoint> JupiterEndpoint =
+				zen::UpstreamEndpoint::CreateJupiterEndpoint(Options, AuthConfig, *m_AuthMgr);
 
 			m_UpstreamCache->RegisterEndpoint(std::move(JupiterEndpoint));
 		}