1 files changed, 4 insertions, 25 deletions
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 59225fc7..a5185a47 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -50,6 +50,7 @@
 #include "src/buildtool/main/diagnose.hpp"
 #include "src/buildtool/main/exit_codes.hpp"
 #include "src/buildtool/main/install_cas.hpp"
+#include "src/buildtool/main/retry.hpp"
 #include "src/buildtool/main/version.hpp"
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
@@ -64,7 +65,6 @@
 #ifndef BOOTSTRAP_BUILD_TOOL
 #include "fmt/core.h"
 #include "src/buildtool/auth/authentication.hpp"
-#include "src/buildtool/common/remote/retry_parameters.hpp"
 #include "src/buildtool/execution_api/execution_service/operation_cache.hpp"
 #include "src/buildtool/execution_api/execution_service/server_implementation.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
@@ -329,29 +329,6 @@ void SetupFileChunker() {
     FileChunker::Initialize();
 }
 
-void SetupRetryConfig(RetryArguments const& args) {
-    if (args.max_attempts) {
-        if (!Retry::SetMaxAttempts(*args.max_attempts)) {
-            Logger::Log(LogLevel::Error, "Invalid value for max-attempts.");
-            std::exit(kExitFailure);
-        }
-    }
-    if (args.initial_backoff_seconds) {
-        if (!Retry::SetInitialBackoffSeconds(*args.initial_backoff_seconds)) {
-            Logger::Log(LogLevel::Error,
-                        "Invalid value for initial-backoff-seconds.");
-            std::exit(kExitFailure);
-        }
-    }
-    if (args.max_backoff_seconds) {
-        if (!Retry::SetMaxBackoffSeconds(*args.max_backoff_seconds)) {
-            Logger::Log(LogLevel::Error,
-                        "Invalid value for max-backoff-seconds.");
-            std::exit(kExitFailure);
-        }
-    }
-}
-
 #endif  // BOOTSTRAP_BUILD_TOOL
 
 // returns path relative to `root`.
@@ -931,7 +908,9 @@ auto main(int argc, char* argv[]) -> int {
         Progress progress{};
 
 #ifndef BOOTSTRAP_BUILD_TOOL
-        SetupRetryConfig(arguments.retry);
+        if (not SetupRetryConfig(arguments.retry)) {
+            std::exit(kExitFailure);
+        }
         GraphTraverser const traverser{
             {jobs,
              std::move(arguments.build),