From eeb391683b44ec463f9559eb9f0d5a7113dac18e Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Thu, 2 Jan 2025 00:57:46 +1100
Subject: [PATCH] Fix incorrect default http token path when datadir flag is
 present.

---
 lighthouse/tests/validator_client.rs | 15 ++++++++++++++-
 validator_client/http_api/src/lib.rs |  1 +
 validator_client/src/config.rs       |  9 +++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lighthouse/tests/validator_client.rs b/lighthouse/tests/validator_client.rs
index c5b303e4d18..1945399c86d 100644
--- a/lighthouse/tests/validator_client.rs
+++ b/lighthouse/tests/validator_client.rs
@@ -345,7 +345,7 @@ fn http_store_keystore_passwords_in_secrets_dir_present() {
 }
 
 #[test]
-fn http_token_path_flag() {
+fn http_token_path_flag_present() {
     let dir = TempDir::new().expect("Unable to create temporary directory");
     CommandLineTest::new()
         .flag("http", None)
@@ -359,6 +359,19 @@ fn http_token_path_flag() {
         });
 }
 
+#[test]
+fn http_token_path_default() {
+    CommandLineTest::new()
+        .flag("http", None)
+        .run()
+        .with_config(|config| {
+            assert_eq!(
+                config.http_api.http_token_path,
+                config.validator_dir.join("api-token.txt")
+            );
+        });
+}
+
 // Tests for Metrics flags.
 #[test]
 fn metrics_flag() {
diff --git a/validator_client/http_api/src/lib.rs b/validator_client/http_api/src/lib.rs
index f3dab3780c0..73ebe717af3 100644
--- a/validator_client/http_api/src/lib.rs
+++ b/validator_client/http_api/src/lib.rs
@@ -106,6 +106,7 @@ pub struct Config {
 
 impl Default for Config {
     fn default() -> Self {
+        // This value is always overridden when building config from CLI.
         let http_token_path = dirs::home_dir()
             .unwrap_or_else(|| PathBuf::from("."))
             .join(DEFAULT_ROOT_DIR)
diff --git a/validator_client/src/config.rs b/validator_client/src/config.rs
index 0fecb5202d1..bb72ef81c80 100644
--- a/validator_client/src/config.rs
+++ b/validator_client/src/config.rs
@@ -314,10 +314,11 @@ impl Config {
             config.http_api.store_passwords_in_secrets_dir = true;
         }
 
-        if cli_args.get_one::<String>("http-token-path").is_some() {
-            config.http_api.http_token_path = parse_required(cli_args, "http-token-path")
-                // For backward compatibility, default to the path under the validator dir if not provided.
-                .unwrap_or_else(|_| config.validator_dir.join(PK_FILENAME));
+        if let Some(http_token_path) = cli_args.get_one::<String>("http-token-path") {
+            config.http_api.http_token_path = PathBuf::from(http_token_path);
+        } else {
+            // For backward compatibility, default to the path under the validator dir if not provided.
+            config.http_api.http_token_path = config.validator_dir.join(PK_FILENAME);
         }
 
         /*