From c30cb3221989b60cee96287a1cb9d9e87f9ba464 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Wed, 29 Jan 2025 14:34:36 +0100
Subject: BazelNetwork: Use ArtifactBlobs in UploadBlobs

---
 src/buildtool/execution_api/remote/bazel/bazel_action.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/buildtool/execution_api/remote/bazel/bazel_action.cpp')

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
index 1b01811e..6fa8eedc 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
@@ -21,7 +21,6 @@
 
 #include "gsl/gsl"
 #include "src/buildtool/common/artifact_digest_factory.hpp"
-#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp"
@@ -53,7 +52,7 @@ BazelAction::BazelAction(
 
 auto BazelAction::Execute(Logger const* logger) noexcept
     -> IExecutionResponse::Ptr {
-    std::unordered_set<BazelBlob> blobs{};
+    std::unordered_set<ArtifactBlob> blobs{};
     auto do_cache = CacheEnabled(cache_flag_);
     auto action = CreateBundlesForAction(&blobs, root_digest_, not do_cache);
     if (not action) {
@@ -139,14 +138,14 @@ auto BazelAction::Execute(Logger const* logger) noexcept
     return nullptr;
 }
 
-auto BazelAction::CreateBundlesForAction(std::unordered_set<BazelBlob>* blobs,
-                                         ArtifactDigest const& exec_dir,
-                                         bool do_not_cache) const noexcept
-    -> std::optional<bazel_re::Digest> {
+auto BazelAction::CreateBundlesForAction(
+    std::unordered_set<ArtifactBlob>* blobs,
+    ArtifactDigest const& exec_dir,
+    bool do_not_cache) const noexcept -> std::optional<bazel_re::Digest> {
     using StoreFunc = BazelMsgFactory::ActionDigestRequest::BlobStoreFunc;
     std::optional<StoreFunc> store_blob = std::nullopt;
     if (blobs != nullptr) {
-        store_blob = [&blobs](BazelBlob&& blob) {
+        store_blob = [&blobs](ArtifactBlob&& blob) {
             blobs->emplace(std::move(blob));
         };
     }
-- 
cgit v1.2.3