3 files changed, 4 insertions, 4 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
index 0024ea97..8a3eb335 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
@@ -659,7 +659,7 @@ auto BazelCasClient::CreateBatchRequestsMaxSize(
             request.set_instance_name(instance_name);
             request_builder(&request, blob);
             if (accumulating_request.ByteSizeLong() + request.ByteSizeLong() >
-                kMaxBatchTransferSize) {
+                MessageLimits::kMaxGrpcLength) {
                 result.emplace_back(std::move(accumulating_request));
                 accumulating_request = std::move(request);
             }
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
index 7b15b667..823148f0 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
@@ -86,7 +86,7 @@ auto BazelNetwork::DoUploadBlobs(
         std::vector<IteratorType> to_stream;
         to_stream.reserve(blobs.size());
         for (auto it = blobs.begin(); it != blobs.end(); ++it) {
-            if (it->data->size() > kMaxBatchTransferSize) {
+            if (it->data->size() > MessageLimits::kMaxGrpcLength) {
                 to_stream.push_back(it);
             }
         }
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 ad61c944..4626c997 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp
@@ -51,7 +51,7 @@ BazelNetworkReader::BazelNetworkReader(
         auto full_tree =
             cas_.GetTree(instance_name_,
                          ArtifactDigestFactory::ToBazel(*request_remote_tree),
-                         kMaxBatchTransferSize);
+                         MessageLimits::kMaxGrpcLength);
         auxiliary_map_ = MakeAuxiliaryMap(std::move(full_tree));
     }
 }
@@ -254,7 +254,7 @@ namespace {
     for (auto it = begin; it != end; ++it) {
         std::size_t const blob_size = it->size();
         size += blob_size;
-        if (blob_size == 0 or size > kMaxBatchTransferSize) {
+        if (blob_size == 0 or size > MessageLimits::kMaxGrpcLength) {
             return it;
         }
     }