Replace ContentBlobContainer<T> with std::unordered_set

2 files changed, 3 insertions, 10 deletions

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index 1c8fd96d..9c3de203 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -49,7 +49,6 @@
 #include "src/buildtool/multithreading/task_system.hpp"
 #include "src/utils/cpp/back_map.hpp"
 #include "src/utils/cpp/expected.hpp"
-#include "src/utils/cpp/transformed_range.hpp"
 
 namespace {
 
@@ -144,8 +143,8 @@ namespace {
     -> std::optional<std::unordered_set<BazelBlob>> {
     std::unordered_set<BazelBlob> blobs;
     try {
-        blobs.reserve(container.Size());
-        for (const auto& blob : container.Blobs()) {
+        blobs.reserve(container.size());
+        for (const auto& blob : container) {
             blobs.emplace(ArtifactDigestFactory::ToBazel(blob.digest),
                           blob.data,
                           blob.is_exec);
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
index 2a06985d..3aaecb88 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
@@ -20,7 +20,6 @@
 #include <filesystem>
 #include <functional>
 #include <iterator>
-#include <unordered_set>
 #include <vector>
 
 #include "fmt/core.h"
@@ -41,7 +40,6 @@
 #include "src/buildtool/logging/logger.hpp"
 #include "src/utils/cpp/gsl.hpp"
 #include "src/utils/cpp/path.hpp"
-#include "src/utils/cpp/transformed_range.hpp"
 
 namespace {
 
@@ -278,11 +276,7 @@ auto BazelResponse::UploadTreeMessageDirectories(
     bazel_re::Tree const& tree) const -> expected<ArtifactDigest, std::string> {
     auto const upload_callback =
         [&network = *network_](BazelBlobContainer&& blobs) -> bool {
-        std::unordered_set<BazelBlob> bazel_blobs;
-        for (auto const& blob : blobs.Blobs()) {
-            bazel_blobs.emplace(blob);
-        }
-        return network.UploadBlobs(std::move(bazel_blobs));
+        return network.UploadBlobs(std::move(blobs));
     };
     auto const hash_function = network_->GetHashFunction();
     BazelBlobContainer dir_blobs{};