1 files changed, 11 insertions, 9 deletions
diff --git a/test/utils/remote_execution/bazel_action_creator.hpp b/test/utils/remote_execution/bazel_action_creator.hpp
index b0038de9..524ce82c 100644
--- a/test/utils/remote_execution/bazel_action_creator.hpp
+++ b/test/utils/remote_execution/bazel_action_creator.hpp
@@ -27,12 +27,12 @@
 
 #include "google/protobuf/repeated_ptr_field.h"
 #include "gsl/gsl"
-#include "src/buildtool/common/bazel_digest_factory.hpp"
+#include "src/buildtool/common/artifact_digest_factory.hpp"
 #include "src/buildtool/common/bazel_types.hpp"
 #include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/remote/retry_config.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/artifact_blob_container.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
@@ -53,7 +53,7 @@
         *(platform->add_properties()) = property;
     }
 
-    std::unordered_set<BazelBlob> blobs;
+    std::unordered_set<ArtifactBlob> blobs;
 
     bazel_re::Command cmd;
     cmd.set_allocated_platform(platform.release());
@@ -71,23 +71,24 @@
                    });
 
     auto cmd_data = cmd.SerializeAsString();
-    auto cmd_id = BazelDigestFactory::HashDataAs<ObjectType::File>(
+    auto cmd_id = ArtifactDigestFactory::HashDataAs<ObjectType::File>(
         hash_function, cmd_data);
     blobs.emplace(cmd_id, cmd_data, /*is_exec=*/false);
 
     bazel_re::Directory empty_dir;
     auto dir_data = empty_dir.SerializeAsString();
-    auto dir_id = BazelDigestFactory::HashDataAs<ObjectType::Tree>(
+    auto dir_id = ArtifactDigestFactory::HashDataAs<ObjectType::Tree>(
         hash_function, dir_data);
     blobs.emplace(dir_id, dir_data, /*is_exec=*/false);
 
     bazel_re::Action action;
-    (*action.mutable_command_digest()) = cmd_id;
+    (*action.mutable_command_digest()) = ArtifactDigestFactory::ToBazel(cmd_id);
     action.set_do_not_cache(false);
-    (*action.mutable_input_root_digest()) = dir_id;
+    (*action.mutable_input_root_digest()) =
+        ArtifactDigestFactory::ToBazel(dir_id);
 
     auto action_data = action.SerializeAsString();
-    auto action_id = BazelDigestFactory::HashDataAs<ObjectType::File>(
+    auto action_id = ArtifactDigestFactory::HashDataAs<ObjectType::File>(
         hash_function, action_data);
     blobs.emplace(action_id, action_data, /*is_exec=*/false);
 
@@ -109,7 +110,8 @@
                               &retry_config);
 
     if (cas_client.BatchUpdateBlobs(instance_name, blobs) == blobs.size()) {
-        return std::make_unique<bazel_re::Digest>(action_id);
+        return std::make_unique<bazel_re::Digest>(
+            ArtifactDigestFactory::ToBazel(action_id));
     }
     return nullptr;
 }