From 8ab573ef1c624e2ed81b2032178c25451176d2f1 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Fri, 14 Feb 2025 15:16:10 +0100 Subject: ApiBundle: Remove HashFunction. And ensure every user obtains HashFunction from corresponding IExecutionApi --- src/buildtool/serve_api/serve_service/source_tree.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/buildtool/serve_api/serve_service/source_tree.cpp') diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index f78c4f2c..0108d8d7 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -418,7 +418,7 @@ auto SourceTreeService::SetDigestInResponse( return TResponse::INTERNAL_ERROR; } // in native mode, set the native digest in response - if (ProtocolTraits::IsNative(apis_.hash_function.GetType())) { + if (ProtocolTraits::IsNative(apis_.remote->GetHashType())) { *(response->mutable_digest()) = ArtifactDigestFactory::ToBazel(*std::move(native_digest)); } @@ -1016,7 +1016,7 @@ auto SourceTreeService::ServeDistdirTree( content_list.reserve(request->distfiles().size()); bool const is_native = - ProtocolTraits::IsNative(apis_.hash_function.GetType()); + ProtocolTraits::IsNative(apis_.remote->GetHashType()); for (auto const& kv : request->distfiles()) { bool blob_found{}; std::string blob_digest; // The digest of the requested distfile, taken @@ -1619,7 +1619,7 @@ auto SourceTreeService::GetRemoteTree( // get tree from remote CAS into tmp dir auto const remote_digest = ArtifactDigestFactory::FromBazel( - apis_.hash_function.GetType(), request->digest()); + apis_.remote->GetHashType(), request->digest()); if (not remote_digest or not apis_.remote->IsAvailable(*remote_digest)) { logger_->Emit(LogLevel::Error, "Remote CAS does not contain expected tree {}", -- cgit v1.2.3