Use RemoteServeConfig functionality via Instance()

...to track changes during refactoring easier.

2 files changed, 5 insertions, 4 deletions

diff --git a/test/buildtool/serve_api/source_tree_client.test.cpp b/test/buildtool/serve_api/source_tree_client.test.cpp
index f2620cc5..63f73155 100644
--- a/test/buildtool/serve_api/source_tree_client.test.cpp
+++ b/test/buildtool/serve_api/source_tree_client.test.cpp
@@ -30,7 +30,7 @@ auto const kRootSymId = std::string{"18770dacfe14c15d88450c21c16668e13ab0e7f9"};
 auto const kBazSymId = std::string{"1868f82682c290f0b1db3cacd092727eef1fa57f"};
 
 TEST_CASE("Serve service client: tree-of-commit request", "[serve_api]") {
-    auto const& info = RemoteServeConfig::RemoteAddress();
+    auto const& info = RemoteServeConfig::Instance().RemoteAddress();
 
     // Create TLC client
     SourceTreeClient st_client(info->host, info->port);
diff --git a/test/utils/serve_service/main-serve.cpp b/test/utils/serve_service/main-serve.cpp
index 537293d2..32b0885e 100644
--- a/test/utils/serve_service/main-serve.cpp
+++ b/test/utils/serve_service/main-serve.cpp
@@ -79,14 +79,15 @@ void wait_for_grpc_to_shutdown() {
     // just serve shares here compatibility and authentication args with
     // remote execution, so no need to do those again
     auto address = ReadRemoteServeAddressFromEnv();
-    if (address and not RemoteServeConfig::SetRemoteAddress(*address)) {
+    if (address and
+        not RemoteServeConfig::Instance().SetRemoteAddress(*address)) {
         Logger::Log(LogLevel::Error, "parsing address '{}' failed.", *address);
         std::exit(EXIT_FAILURE);
     }
 
     auto repos = ReadRemoteServeReposFromEnv();
     if (not repos.empty() and
-        not RemoteServeConfig::SetKnownRepositories(repos)) {
+        not RemoteServeConfig::Instance().SetKnownRepositories(repos)) {
         Logger::Log(LogLevel::Error, "setting serve repos failed.");
         std::exit(EXIT_FAILURE);
     }
@@ -105,7 +106,7 @@ void wait_for_grpc_to_shutdown() {
         std::exit(EXIT_FAILURE);
     }
 
-    return static_cast<bool>(RemoteServeConfig::RemoteAddress());
+    return static_cast<bool>(RemoteServeConfig::Instance().RemoteAddress());
 }
 
 }  // namespace