From ddf48a60029bed958fb2cf0238dbb0bca0b770fb Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 11 Sep 2024 10:21:13 +0200 Subject: Add to ProtocolTraits static functions that provide protocol-specific behaviour --- src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/buildtool/execution_api/remote') 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 4b411d91..d78a63de 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp @@ -18,6 +18,7 @@ #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/bazel_digest_factory.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" @@ -71,7 +72,7 @@ auto BazelNetworkReader::ReadDirectory(ArtifactDigest const& digest) auto BazelNetworkReader::ReadGitTree(ArtifactDigest const& digest) const noexcept -> std::optional { - ExpectsAudit(hash_function_.GetType() == HashFunction::Type::GitSHA1); + ExpectsAudit(ProtocolTraits::IsNative(hash_function_.GetType())); auto read_blob = ReadSingleBlob(digest); if (not read_blob) { @@ -145,7 +146,7 @@ auto BazelNetworkReader::DumpBlob(Artifact::ObjectInfo const& info, auto BazelNetworkReader::MakeAuxiliaryMap( std::vector&& full_tree) const noexcept -> std::optional { - ExpectsAudit(hash_function_.GetType() == HashFunction::Type::PlainSHA256); + ExpectsAudit(not ProtocolTraits::IsNative(hash_function_.GetType())); DirectoryMap result; result.reserve(full_tree.size()); -- cgit v1.2.3