Fix incorrect default http token path when datadir flag is present.

Author: jimmygchen

lighthouse/tests/validator_client.rs

@@ -7,6 +7,7 @@ use sensitive_url::SensitiveUrl;
 use std::fs::File;
 use std::io::Write;
 use std::net::IpAddr;
+use std::path::Path;
 use std::path::PathBuf;
 use std::process::Command;
 use std::str::FromStr;
@@ -345,7 +346,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 +360,21 @@ fn http_token_path_flag() {
         });
 }
 
+#[test]
+fn http_token_path_default() {
+    let custom_datadir = "/custom-datadir";
+    CommandLineTest::new()
+        .flag("datadir", Some(custom_datadir))
+        .flag("http", None)
+        .run()
+        .with_config(|config| {
+            assert_eq!(
+                config.http_api.http_token_path,
+                Path::new(custom_datadir).join("api-token.txt")
+            );
+        });
+}
+
 // Tests for Metrics flags.
 #[test]
 fn metrics_flag() {

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)

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);
         }
 
         /*