Pass HashFunction to ArtifactDigest::Create

3 files changed, 19 insertions, 15 deletions

diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index ad4093f3..e45af2f1 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -56,7 +56,6 @@
     , ["@", "grpc", "", "grpc++"]
     , ["src/buildtool/common/remote", "retry"]
     , ["src/buildtool/execution_api/common", "message_limits"]
-    , ["src/buildtool/crypto", "hash_function"]
     , ["src/utils/cpp", "path"]
     ]
   }
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 4547ff8c..135cfd52 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
@@ -138,9 +138,10 @@ auto BazelNetworkReader::MakeAuxiliaryMap(
     result.reserve(full_tree.size());
     for (auto& dir : full_tree) {
         try {
-            result.emplace(ArtifactDigest::Create<ObjectType::File>(
-                               dir.SerializeAsString()),
-                           std::move(dir));
+            result.emplace(
+                ArtifactDigest::Create<ObjectType::File>(
+                    HashFunction::Instance(), dir.SerializeAsString()),
+                std::move(dir));
         } catch (...) {
             return std::nullopt;
         }
@@ -191,8 +192,10 @@ auto BazelNetworkReader::BatchReadBlobs(
 auto BazelNetworkReader::Validate(BazelBlob const& blob) noexcept -> bool {
     ArtifactDigest const rehashed_digest =
         NativeSupport::IsTree(blob.digest.hash())
-            ? ArtifactDigest::Create<ObjectType::Tree>(*blob.data)
-            : ArtifactDigest::Create<ObjectType::File>(*blob.data);
+            ? ArtifactDigest::Create<ObjectType::Tree>(HashFunction::Instance(),
+                                                       *blob.data)
+            : ArtifactDigest::Create<ObjectType::File>(HashFunction::Instance(),
+                                                       *blob.data);
     if (rehashed_digest == ArtifactDigest{blob.digest}) {
         return true;
     }
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
index 1b7682bd..0cb860a3 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
@@ -18,6 +18,7 @@
 
 #include "gsl/gsl"
 #include "src/buildtool/compatibility/native_support.hpp"
+#include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
 #include "src/buildtool/execution_api/common/common_api.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp"
@@ -30,7 +31,8 @@ namespace {
 auto ProcessDirectoryMessage(bazel_re::Directory const& dir) noexcept
     -> std::optional<BazelBlob> {
     auto data = dir.SerializeAsString();
-    auto digest = ArtifactDigest::Create<ObjectType::File>(data);
+    auto digest = ArtifactDigest::Create<ObjectType::File>(
+        HashFunction::Instance(), data);
     return BazelBlob{std::move(digest), std::move(data), /*is_exec=*/false};
 }
 
@@ -99,8 +101,8 @@ auto BazelResponse::Populate() noexcept -> bool {
             artifacts.emplace(
                 link.path(),
                 Artifact::ObjectInfo{
-                    .digest =
-                        ArtifactDigest::Create<ObjectType::File>(link.target()),
+                    .digest = ArtifactDigest::Create<ObjectType::File>(
+                        HashFunction::Instance(), link.target()),
                     .type = ObjectType::Symlink});
         } catch (...) {
             return false;
@@ -111,8 +113,8 @@ auto BazelResponse::Populate() noexcept -> bool {
             artifacts.emplace(
                 link.path(),
                 Artifact::ObjectInfo{
-                    .digest =
-                        ArtifactDigest::Create<ObjectType::File>(link.target()),
+                    .digest = ArtifactDigest::Create<ObjectType::File>(
+                        HashFunction::Instance(), link.target()),
                     .type = ObjectType::Symlink});
             dir_symlinks.emplace(link.path());  // add it to set
         } catch (...) {
@@ -126,8 +128,8 @@ auto BazelResponse::Populate() noexcept -> bool {
             artifacts.emplace(
                 link.path(),
                 Artifact::ObjectInfo{
-                    .digest =
-                        ArtifactDigest::Create<ObjectType::File>(link.target()),
+                    .digest = ArtifactDigest::Create<ObjectType::File>(
+                        HashFunction::Instance(), link.target()),
                     .type = ObjectType::Symlink});
         } catch (...) {
             return false;
@@ -138,8 +140,8 @@ auto BazelResponse::Populate() noexcept -> bool {
             artifacts.emplace(
                 link.path(),
                 Artifact::ObjectInfo{
-                    .digest =
-                        ArtifactDigest::Create<ObjectType::File>(link.target()),
+                    .digest = ArtifactDigest::Create<ObjectType::File>(
+                        HashFunction::Instance(), link.target()),
                     .type = ObjectType::Symlink});
         } catch (...) {
             return false;