CommonApi: Remove template parameter from UploadAndUpdateContainer

...since it works with ArtifactBlobs only.

2 files changed, 9 insertions, 11 deletions

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index d9990f9a..03d79199 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -74,7 +74,7 @@ namespace {
                     ? IsExecutableObject(info_map.at(blob.digest).type)
                     : false;
             // Collect blob and upload to other CAS if transfer size reached.
-            if (not UpdateContainerAndUpload<ArtifactDigest>(
+            if (not UpdateContainerAndUpload(
                     &container,
                     std::move(blob),
                     /*exception_is_fatal=*/true,
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
index e4bc9248..19e7b972 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
@@ -294,11 +294,10 @@ auto BazelResponse::UploadTreeMessageDirectories(
     }
     auto const root_digest = rootdir_blob->digest;
     // store or upload rootdir blob, taking maximum transfer size into account
-    if (not UpdateContainerAndUpload<ArtifactDigest>(
-            &dir_blobs,
-            *std::move(rootdir_blob),
-            /*exception_is_fatal=*/false,
-            upload_callback)) {
+    if (not UpdateContainerAndUpload(&dir_blobs,
+                                     *std::move(rootdir_blob),
+                                     /*exception_is_fatal=*/false,
+                                     upload_callback)) {
         return unexpected{fmt::format(
             "failed to upload Tree with root digest {}", root_digest.hash())};
     }
@@ -310,11 +309,10 @@ auto BazelResponse::UploadTreeMessageDirectories(
             return unexpected{std::move(blob).error()};
         }
         auto const blob_digest = blob->digest;
-        if (not UpdateContainerAndUpload<ArtifactDigest>(
-                &dir_blobs,
-                *std::move(blob),
-                /*exception_is_fatal=*/false,
-                upload_callback)) {
+        if (not UpdateContainerAndUpload(&dir_blobs,
+                                         *std::move(blob),
+                                         /*exception_is_fatal=*/false,
+                                         upload_callback)) {
             return unexpected{
                 fmt::format("failed to upload Tree subdir with digest {}",
                             blob_digest.hash())};