From c01123bd19be5398f20730d2872ad337e5b5d73a Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Thu, 29 Aug 2024 17:31:02 +0200
Subject: Cast ArtifactDigest to bazel_re::Digest explicitly

...to simplify further refactoring.
---
 .../execution_api/remote/bazel/bazel_api.cpp       | 23 ++++++++++++----------
 .../remote/bazel/bazel_network_reader.cpp          |  9 ++++++---
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'src/buildtool/execution_api/remote/bazel')

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index 2f8d5d08..e1d57b9b 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -170,7 +170,9 @@ namespace {
     try {
         blobs.reserve(container.Size());
         for (const auto& blob : container.Blobs()) {
-            blobs.emplace_back(blob.digest, blob.data, blob.is_exec);
+            blobs.emplace_back(static_cast<bazel_re::Digest>(blob.digest),
+                               blob.data,
+                               blob.is_exec);
         }
     } catch (...) {
         return std::nullopt;
@@ -211,14 +213,15 @@ auto BazelApi::CreateAction(
     std::map<std::string, std::string> const& env_vars,
     std::map<std::string, std::string> const& properties) const noexcept
     -> IExecutionAction::Ptr {
-    return std::unique_ptr<BazelAction>{new BazelAction{network_,
-                                                        root_digest,
-                                                        command,
-                                                        cwd,
-                                                        output_files,
-                                                        output_dirs,
-                                                        env_vars,
-                                                        properties}};
+    return std::unique_ptr<BazelAction>{
+        new BazelAction{network_,
+                        static_cast<bazel_re::Digest>(root_digest),
+                        command,
+                        cwd,
+                        output_files,
+                        output_dirs,
+                        env_vars,
+                        properties}};
 }
 
 // NOLINTNEXTLINE(misc-no-recursion, google-default-arguments)
@@ -549,7 +552,7 @@ auto BazelApi::CreateAction(
 
 [[nodiscard]] auto BazelApi::IsAvailable(
     ArtifactDigest const& digest) const noexcept -> bool {
-    return network_->IsAvailable(digest);
+    return network_->IsAvailable(static_cast<bazel_re::Digest>(digest));
 }
 
 [[nodiscard]] auto BazelApi::IsAvailable(
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
index 9b24bc80..09ebb662 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
@@ -41,8 +41,10 @@ BazelNetworkReader::BazelNetworkReader(
     if (Compatibility::IsCompatible() and request_remote_tree) {
         // Query full tree from remote CAS. Note that this is currently not
         // supported by Buildbarn revision c3c06bbe2a.
-        auto full_tree = cas_.GetTree(
-            instance_name_, *request_remote_tree, kMaxBatchTransferSize);
+        auto full_tree =
+            cas_.GetTree(instance_name_,
+                         static_cast<bazel_re::Digest>(*request_remote_tree),
+                         kMaxBatchTransferSize);
         auxiliary_map_ = MakeAuxiliaryMap(std::move(full_tree));
     }
 }
@@ -122,7 +124,8 @@ auto BazelNetworkReader::DumpRawTree(Artifact::ObjectInfo const& info,
 auto BazelNetworkReader::DumpBlob(Artifact::ObjectInfo const& info,
                                   DumpCallback const& dumper) const noexcept
     -> bool {
-    auto reader = cas_.IncrementalReadSingleBlob(instance_name_, info.digest);
+    auto reader = cas_.IncrementalReadSingleBlob(
+        instance_name_, static_cast<bazel_re::Digest>(info.digest));
     auto data = reader.Next();
     while (data and not data->empty()) {
         try {
-- 
cgit v1.2.3