target_map: Remove unneeded method to perform endpoint consistency check

As we already have a good enough API call and in order to improve
specificity in log messages, there is no need for one more level of
abstraction. This will also make it easier to drop in the future
this check (if deemed unnecessary anymore), while keeping in place
the mandatory check that a serve endpoint has been configured.

1 files changed, 11 insertions, 19 deletions

diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp
index 805a0d50..ebb07a91 100644
--- a/src/buildtool/build_engine/target_map/target_map.cpp
+++ b/src/buildtool/build_engine/target_map/target_map.cpp
@@ -1633,21 +1633,6 @@ void GlobTargetWithDirEntry(
         });
 }
 
-#ifndef BOOTSTRAP_BUILD_TOOL
-// The remote execution endpoint specified on the command line must be the same
-// used by the provided just serve instance.
-[[nodiscard]] auto CheckServeAndExecutionEndpoints() -> bool {
-    auto sadd = RemoteServeConfig::RemoteAddress();
-    if (!sadd) {
-        Logger::Log(LogLevel::Error,
-                    "Absent root detected. Please provide "
-                    "--remote-serve-address and retry.");
-        return false;
-    }
-    return ServeApi::CheckServeRemoteExecution();
-}
-#endif  // BOOTSTRAP_BUILD_TOOL
-
 }  // namespace
 
 namespace BuildMaps::Target {
@@ -1769,13 +1754,20 @@ auto CreateTargetMap(
 #ifndef BOOTSTRAP_BUILD_TOOL
         else if (repo_config->TargetRoot(key.target.ToModule().repository)
                      ->IsAbsent()) {
-            static auto consistent_serve_and_remote_execution =
-                CheckServeAndExecutionEndpoints();
-            if (!consistent_serve_and_remote_execution) {
+            if (not RemoteServeConfig::RemoteAddress()) {
+                (*logger)(
+                    fmt::format("Root for target {} is absent, but no serve "
+                                "endpoint was configured. Please provide "
+                                "--remote-serve=address and retry.",
+                                key.target.ToJson().dump()),
+                    /*is_fatal=*/true);
+                return;
+            }
+            if (not ServeApi::CheckServeRemoteExecution()) {
                 (*logger)(
                     "Inconsistent remote execution endpoint and just serve "
                     "configuration detected.",
-                    true);
+                    /*is_fatal=*/true);
                 return;
             }
             absent_target_map->ConsumeAfterKeysReady(