Include ArtifactDigestFactory into "common" library

25 files changed, 12 insertions, 71 deletions

diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index deb7f09f..44924a69 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -69,7 +69,6 @@
     , ["src/buildtool/build_engine/expression", "linked_map"]
     , ["src/buildtool/common", "action_description"]
     , ["src/buildtool/common", "artifact_description"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "tree"]
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS
index 80d6ca34..adbea038 100644
--- a/src/buildtool/common/TARGETS
+++ b/src/buildtool/common/TARGETS
@@ -59,26 +59,6 @@
     ]
   , "stage": ["src", "buildtool", "common"]
   }
-, "artifact_digest_factory":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["artifact_digest_factory"]
-  , "hdrs": ["artifact_digest_factory.hpp"]
-  , "srcs": ["artifact_digest_factory.cpp"]
-  , "deps":
-    [ "common"
-    , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/crypto", "hash_info"]
-    , ["src/buildtool/file_system", "object_type"]
-    , ["src/utils/cpp", "expected"]
-    ]
-  , "private-deps":
-    [ "bazel_digest_factory"
-    , "bazel_types"
-    , "protocol_traits"
-    , ["@", "gsl", "", "gsl"]
-    ]
-  , "stage": ["src", "buildtool", "common"]
-  }
 , "artifact_blob":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["artifact_blob"]
@@ -92,8 +72,7 @@
     , ["src/utils/cpp", "incremental_reader"]
     ]
   , "private-deps":
-    [ "artifact_digest_factory"
-    , ["@", "fmt", "", "fmt"]
+    [ ["@", "fmt", "", "fmt"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/utils/cpp", "hash_combine"]
     , ["src/utils/cpp", "in_place_visitor"]
@@ -106,10 +85,12 @@
   , "hdrs":
     [ "action.hpp"
     , "artifact_digest.hpp"
+    , "artifact_digest_factory.hpp"
     , "artifact.hpp"
     , "identifier.hpp"
     , "statistics.hpp"
     ]
+  , "srcs": ["artifact_digest_factory.cpp"]
   , "deps":
     [ "protocol_traits"
     , ["@", "fmt", "", "fmt"]
@@ -122,6 +103,8 @@
     , ["src/utils/cpp", "expected"]
     , ["src/utils/cpp", "hash_combine"]
     ]
+  , "private-deps":
+    ["bazel_digest_factory", "bazel_types", ["@", "gsl", "", "gsl"]]
   , "stage": ["src", "buildtool", "common"]
   }
 , "artifact_description":
@@ -136,8 +119,7 @@
     , ["src/buildtool/file_system", "object_type"]
     ]
   , "private-deps":
-    [ "artifact_digest_factory"
-    , ["@", "gsl", "", "gsl"]
+    [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "expected"]
diff --git a/src/buildtool/computed_roots/TARGETS b/src/buildtool/computed_roots/TARGETS
index 67592e95..57b4436a 100644
--- a/src/buildtool/computed_roots/TARGETS
+++ b/src/buildtool/computed_roots/TARGETS
@@ -118,7 +118,6 @@
     , ["src/buildtool/build_engine/base_maps", "targets_file_map"]
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/build_engine/target_map", "configured_target"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "protocol_traits"]
diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS
index be662b3d..7af7b004 100644
--- a/src/buildtool/execution_api/bazel_msg/TARGETS
+++ b/src/buildtool/execution_api/bazel_msg/TARGETS
@@ -24,7 +24,6 @@
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
     , ["@", "protoc", "", "libprotobuf"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/utils/cpp", "hex_string"]
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 39ccc042..3ffd508f 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -26,7 +26,6 @@
     ]
   , "private-deps":
     [ ["@", "json", "", "json"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/utils/cpp", "hex_string"]
     , ["src/utils/cpp", "path"]
@@ -59,10 +58,7 @@
     , ["src/utils/cpp", "expected"]
     ]
   , "private-deps":
-    [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
-    , ["src/buildtool/common", "bazel_types"]
-    ]
+    [["@", "fmt", "", "fmt"], ["src/buildtool/common", "bazel_types"]]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
 , "api_bundle":
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS
index 1cca42a0..45d99225 100644
--- a/src/buildtool/execution_api/execution_service/TARGETS
+++ b/src/buildtool/execution_api/execution_service/TARGETS
@@ -24,7 +24,6 @@
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
     , ["@", "protoc", "", "libprotobuf"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/crypto", "hash_function"]
@@ -57,7 +56,6 @@
     ]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/logging", "log_level"]
@@ -88,7 +86,6 @@
     [ "cas_utils"
     , ["@", "fmt", "", "fmt"]
     , ["@", "protoc", "", "libprotobuf"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/logging", "log_level"]
diff --git a/src/buildtool/execution_api/git/TARGETS b/src/buildtool/execution_api/git/TARGETS
index 6db86b4c..4283e041 100644
--- a/src/buildtool/execution_api/git/TARGETS
+++ b/src/buildtool/execution_api/git/TARGETS
@@ -12,7 +12,6 @@
   , "private-deps":
     [ ["@", "json", "", "json"]
     , ["src/buildtool/common", "artifact_blob"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/file_system", "file_system_manager"]
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 7dfe791a..f41cbc1a 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -21,7 +21,6 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "protoc", "", "libprotobuf"]
     , ["src/buildtool/common", "artifact_blob"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index a575edb0..e275dead 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -50,7 +50,6 @@
     [ ["@", "fmt", "", "fmt"]
     , ["@", "grpc", "", "grpc++"]
     , ["@", "protoc", "", "libprotobuf"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_digest_factory"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/common/remote", "retry"]
@@ -91,7 +90,6 @@
     [ ["@", "fmt", "", "fmt"]
     , ["@", "protoc", "", "libprotobuf"]
     , ["src/buildtool/common", "artifact_blob"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS
index 8b0c110a..6435af6a 100644
--- a/src/buildtool/execution_engine/executor/TARGETS
+++ b/src/buildtool/execution_engine/executor/TARGETS
@@ -10,7 +10,6 @@
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/build_engine/target_map", "configured_target"]
     , ["src/buildtool/common", "artifact_blob"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "git_hashes_converter"]
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index a55a900c..dc7774ac 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -26,7 +26,6 @@
     [ "file_storage"
     , "object_type"
     , ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_system_manager"]
@@ -140,7 +139,6 @@
     [ "git_context"
     , ["@", "fmt", "", "fmt"]
     , ["", "libgit2"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/logging", "log_level"]
@@ -186,7 +184,6 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "json", "", "json"]
     , ["src/buildtool/common", "artifact_description"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "git_hashes_converter"]
     , ["src/buildtool/common", "protocol_traits"]
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index 44440484..72cae667 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -165,7 +165,6 @@
   , "private-deps":
     [ "archive"
     , ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common/remote", "remote_common"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/remote", "config"]
@@ -386,7 +385,6 @@
   , "stage": ["src", "buildtool", "main"]
   , "private-deps":
     [ ["", "libarchive"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "log_level"]
diff --git a/src/buildtool/serve_api/remote/TARGETS b/src/buildtool/serve_api/remote/TARGETS
index a225d91e..089bb7e2 100644
--- a/src/buildtool/serve_api/remote/TARGETS
+++ b/src/buildtool/serve_api/remote/TARGETS
@@ -30,7 +30,6 @@
   , "stage": ["src", "buildtool", "serve_api", "remote"]
   , "private-deps":
     [ ["@", "grpc", "", "grpc++"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common/remote", "client_common"]
     , ["src/buildtool/logging", "log_level"]
@@ -92,7 +91,6 @@
     , ["@", "grpc", "", "grpc++"]
     , ["@", "json", "", "json"]
     , ["@", "protoc", "", "libprotobuf"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common/remote", "client_common"]
     , ["src/buildtool/crypto", "hash_function"]
diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS
index 2a2928e5..357469ff 100644
--- a/src/buildtool/serve_api/serve_service/TARGETS
+++ b/src/buildtool/serve_api/serve_service/TARGETS
@@ -30,7 +30,6 @@
     [ ["@", "fmt", "", "fmt"]
     , ["@", "json", "", "json"]
     , ["@", "protoc", "", "libprotobuf"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
@@ -133,7 +132,6 @@
     , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
     , ["src/buildtool/build_engine/target_map", "configured_target"]
     , ["src/buildtool/build_engine/target_map", "result_map"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "config"]
diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS
index cd73c2b3..2369f941 100644
--- a/src/buildtool/storage/TARGETS
+++ b/src/buildtool/storage/TARGETS
@@ -59,7 +59,6 @@
     , ["src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/common", "artifact_description"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "protocol_traits"]
@@ -109,7 +108,7 @@
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
     , ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
+    , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/crypto", "hasher"]
     , ["src/buildtool/file_system", "file_storage"]
@@ -169,7 +168,6 @@
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
     , ["@", "json", "", "json"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/file_system", "object_type"]
     ]
   }
diff --git a/src/buildtool/tree_structure/TARGETS b/src/buildtool/tree_structure/TARGETS
index cda417a7..c103ea93 100644
--- a/src/buildtool/tree_structure/TARGETS
+++ b/src/buildtool/tree_structure/TARGETS
@@ -13,8 +13,7 @@
     ]
   , "stage": ["src", "buildtool", "tree_structure"]
   , "private-deps":
-    [ ["src/buildtool/common", "artifact_digest_factory"]
-    , ["src/buildtool/crypto", "hash_function"]
+    [ ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/storage", "storage"]
     , ["src/utils/cpp", "expected"]
@@ -37,7 +36,6 @@
   , "stage": ["src", "buildtool", "tree_structure"]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/crypto", "hash_function"]
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index 4e5c9203..dcbd8b2b 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -19,7 +19,6 @@
   , "stage": ["src", "other_tools", "root_maps"]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_root"]
@@ -57,7 +56,6 @@
   , "stage": ["src", "other_tools", "root_maps"]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_root"]
@@ -97,7 +95,7 @@
   , "stage": ["src", "other_tools", "root_maps"]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
+    , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/file_system", "file_system_manager"]
@@ -132,7 +130,6 @@
   , "stage": ["src", "other_tools", "root_maps"]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/crypto", "hash_info"]
diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS
index b71693be..6e69c7e5 100644
--- a/test/buildtool/common/TARGETS
+++ b/test/buildtool/common/TARGETS
@@ -6,7 +6,6 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index c253f49c..b3977bab 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -8,7 +8,6 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "artifact_blob"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "common"]
@@ -29,7 +28,6 @@
   , "srcs": ["bytestream_utils.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
@@ -49,7 +47,6 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "gsl", "", "gsl"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS
index 48a8f2f2..de55dce5 100644
--- a/test/buildtool/execution_api/local/TARGETS
+++ b/test/buildtool/execution_api/local/TARGETS
@@ -8,7 +8,6 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "artifact_blob"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index c0dcc56f..aaacf477 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -41,7 +41,6 @@
     , ["@", "src", "src/buildtool/common", "action_description"]
     , ["@", "src", "src/buildtool/common", "artifact_blob"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/common/remote", "remote_common"]
diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS
index d630f6bf..c1ac0af6 100644
--- a/test/buildtool/file_system/TARGETS
+++ b/test/buildtool/file_system/TARGETS
@@ -21,7 +21,6 @@
   , "srcs": ["object_cas.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
@@ -66,7 +65,6 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "fmt", "", "fmt"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS
index a941ea56..d97e4222 100644
--- a/test/buildtool/storage/TARGETS
+++ b/test/buildtool/storage/TARGETS
@@ -15,7 +15,7 @@
   , "data": [["buildtool/storage", "test_data"]]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
+    , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -33,7 +33,6 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "gsl", "", "gsl"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "bazel_types"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
diff --git a/test/buildtool/tree_structure/TARGETS b/test/buildtool/tree_structure/TARGETS
index 336e3230..ec7335ce 100644
--- a/test/buildtool/tree_structure/TARGETS
+++ b/test/buildtool/tree_structure/TARGETS
@@ -5,7 +5,6 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "gsl", "", "gsl"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
diff --git a/test/utils/TARGETS b/test/utils/TARGETS
index 183c5009..693d3ba1 100644
--- a/test/utils/TARGETS
+++ b/test/utils/TARGETS
@@ -16,8 +16,8 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "protoc", "", "libprotobuf"]
     , ["@", "src", "src/buildtool/common", "artifact_blob"]
-    , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "bazel_types"]
+    , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common/remote", "remote_common"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]