From 686a13142b816dfa334bb85f3ffdcc62a81a3bb4 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Thu, 23 Jan 2025 17:11:39 +0100 Subject: ByteStreamUtils: Use ArtifactDigest --- .../execution_api/execution_service/bytestream_server.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/buildtool/execution_api/execution_service/bytestream_server.cpp') diff --git a/src/buildtool/execution_api/execution_service/bytestream_server.cpp b/src/buildtool/execution_api/execution_service/bytestream_server.cpp index 802878a4..b4e1cb07 100644 --- a/src/buildtool/execution_api/execution_service/bytestream_server.cpp +++ b/src/buildtool/execution_api/execution_service/bytestream_server.cpp @@ -24,8 +24,6 @@ #include "fmt/core.h" #include "google/protobuf/stubs/port.h" #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/bytestream_utils.hpp" #include "src/buildtool/execution_api/execution_service/cas_utils.hpp" @@ -48,8 +46,8 @@ auto BytestreamServiceImpl::Read( logger_.Emit(LogLevel::Error, "{}", str); return ::grpc::Status{::grpc::StatusCode::INVALID_ARGUMENT, str}; } - auto const read_digest = ArtifactDigestFactory::FromBazel( - storage_config_.hash_function.GetType(), read_request->GetDigest()); + auto const read_digest = + read_request->GetDigest(storage_config_.hash_function.GetType()); if (not read_digest) { logger_.Emit(LogLevel::Debug, "{}", read_digest.error()); return ::grpc::Status{::grpc::StatusCode::INVALID_ARGUMENT, @@ -115,8 +113,8 @@ auto BytestreamServiceImpl::Write( return ::grpc::Status{::grpc::StatusCode::INVALID_ARGUMENT, str}; } - auto const write_digest = ArtifactDigestFactory::FromBazel( - storage_config_.hash_function.GetType(), write_request->GetDigest()); + auto const write_digest = + write_request->GetDigest(storage_config_.hash_function.GetType()); if (not write_digest) { logger_.Emit(LogLevel::Debug, "{}", write_digest.error()); return ::grpc::Status{::grpc::StatusCode::INVALID_ARGUMENT, -- cgit v1.2.3