just serve: Fix inconsistencies

- add missing serve_api TARGETS file
- rename service client to align with server naming scheme
- fix inconsistencies in comments between implementation and protocol

2 files changed, 13 insertions, 20 deletions

diff --git a/test/buildtool/serve_api/TARGETS b/test/buildtool/serve_api/TARGETS
index b4405888..5d8af3c0 100644
--- a/test/buildtool/serve_api/TARGETS
+++ b/test/buildtool/serve_api/TARGETS
@@ -1,22 +1,15 @@
-{ "target_level_cache_client":
+{ "source_tree_client":
   { "type": ["utils/serve_service", "CC test"]
-  , "name": ["target_level_cache_client"]
-  , "srcs": ["target_level_cache_client.test.cpp"]
+  , "name": ["source_tree_client"]
+  , "srcs": ["source_tree_client.test.cpp"]
   , "data": [["buildtool/file_system", "test_data"]]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["utils", "catch-main-serve"]
-    , [ "@"
-      , "src"
-      , "src/buildtool/serve_api/remote"
-      , "serve_target_level_cache_client"
-      ]
+    , ["@", "src", "src/buildtool/serve_api/remote", "source_tree_client"]
     ]
   , "stage": ["test", "buildtool", "serve_api"]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
-  , "deps": ["target_level_cache_client"]
-  }
+  {"type": "install", "tainted": ["test"], "deps": ["source_tree_client"]}
 }
diff --git a/test/buildtool/serve_api/target_level_cache_client.test.cpp b/test/buildtool/serve_api/source_tree_client.test.cpp
index 972d57eb..8c1e3b30 100644
--- a/test/buildtool/serve_api/target_level_cache_client.test.cpp
+++ b/test/buildtool/serve_api/source_tree_client.test.cpp
@@ -16,7 +16,7 @@
 
 #include "catch2/catch_test_macros.hpp"
 #include "src/buildtool/serve_api/remote/config.hpp"
-#include "src/buildtool/serve_api/remote/serve_target_level_cache_client.hpp"
+#include "src/buildtool/serve_api/remote/source_tree_client.hpp"
 
 auto const kRootCommit =
     std::string{"e4fc610c60716286b98cf51ad0c8f0d50f3aebb5"};
@@ -32,36 +32,36 @@ TEST_CASE("Serve service client: tree-of-commit request", "[serve_api]") {
     auto const& info = RemoteServeConfig::RemoteAddress();
 
     // Create TLC client
-    ServeTargetLevelCacheClient tlc_client(info->host, info->port);
+    SourceTreeClient st_client(info->host, info->port);
 
     SECTION("Commit in bare checkout") {
-        auto root_id = tlc_client.ServeCommitTree(kRootCommit, ".", false);
+        auto root_id = st_client.ServeCommitTree(kRootCommit, ".", false);
         REQUIRE(root_id);
         CHECK(root_id.value() == kRootId);
 
-        auto baz_id = tlc_client.ServeCommitTree(kRootCommit, "baz", false);
+        auto baz_id = st_client.ServeCommitTree(kRootCommit, "baz", false);
         REQUIRE(baz_id);
         CHECK(baz_id.value() == kBazId);
     }
 
     SECTION("Commit in non-bare checkout") {
-        auto root_id = tlc_client.ServeCommitTree(kRootSymCommit, ".", false);
+        auto root_id = st_client.ServeCommitTree(kRootSymCommit, ".", false);
         REQUIRE(root_id);
         CHECK(root_id.value() == kRootSymId);
 
-        auto baz_id = tlc_client.ServeCommitTree(kRootSymCommit, "baz", false);
+        auto baz_id = st_client.ServeCommitTree(kRootSymCommit, "baz", false);
         REQUIRE(baz_id);
         CHECK(baz_id.value() == kBazSymId);
     }
 
     SECTION("Subdir not found") {
         auto root_id =
-            tlc_client.ServeCommitTree(kRootCommit, "does_not_exist", false);
+            st_client.ServeCommitTree(kRootCommit, "does_not_exist", false);
         CHECK_FALSE(root_id);
     }
 
     SECTION("Commit not known") {
-        auto root_id = tlc_client.ServeCommitTree(
+        auto root_id = st_client.ServeCommitTree(
             "0123456789abcdef0123456789abcdef01234567", ".", false);
         CHECK_FALSE(root_id);
     }