fix test

sigp · Apr 4, 2024 · 30556d0 · 30556d0
1 parent f6653b0
commit 30556d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/beacon_node/src/cli.rs b/beacon_node/src/cli.rs
@@ -1439,8 +1439,6 @@ pub fn cli_app() -> Command {
                 .long("progressive-balances")
                 .value_name("MODE")
                 .help("Deprecated. This optimisation is now the default and cannot be disabled.")
-                .takes_value(true)
-                .possible_values(&["fast", "disabled", "checked", "strict"])
                 .action(ArgAction::Set)
                 .display_order(0)
         )

diff --git a/beacon_node/src/config.rs b/beacon_node/src/config.rs
@@ -3,7 +3,7 @@ use beacon_chain::chain_config::{
     DEFAULT_RE_ORG_MAX_EPOCHS_SINCE_FINALIZATION, DEFAULT_RE_ORG_THRESHOLD,
 };
 use beacon_chain::TrustedSetup;
-use clap::ArgMatches;
+use clap::{ArgMatches, Id};
 use clap_utils::flags::DISABLE_MALLOC_TUNING_FLAG;
 use clap_utils::{parse_flag, parse_required};
 use client::{ClientConfig, ClientGenesis};
@@ -103,7 +103,7 @@ pub fn get_config<E: EthSpec>(
      * Http API server
      */
 
-    if parse_flag(cli_args, "enable_http") {
+    if cli_args.get_one::<Id>("enable_http").is_some() {
         client_config.http_api.enabled = true;
 
         if let Some(address) = cli_args.get_one::<String>("http-address") {
@@ -843,7 +843,7 @@ pub fn get_config<E: EthSpec>(
         client_config.network.invalid_block_storage = Some(path);
     }
 
-    if cli_args.is_present("progressive-balances") {
+    if cli_args.get_one::<String>("progressive-balances").is_some() {
         warn!(
             log,
             "Progressive balances mode is deprecated";

diff --git a/lighthouse/tests/validator_client.rs b/lighthouse/tests/validator_client.rs
@@ -594,25 +594,7 @@ fn wrong_broadcast_flag() {
 #[test]
 fn latency_measurement_service() {
     CommandLineTest::new()
-        .flag("latency-measurement-service", None)
-        .run()
-        .with_config(|config| {
-            assert!(config.enable_latency_measurement_service);
-        });
-    CommandLineTest::new()
-        .flag("latency-measurement-service", None)
-        .run()
-        .with_config(|config| {
-            assert!(config.enable_latency_measurement_service);
-        });
-    CommandLineTest::new()
-        .flag("latency-measurement-service", None)
-        .run()
-        .with_config(|config| {
-            assert!(config.enable_latency_measurement_service);
-        });
-    CommandLineTest::new()
-        // .flag("latency-measurement-service", Some("false"))
+        .flag("disable-latency-measurement-service", None)
         .run()
         .with_config(|config| {
             assert!(!config.enable_latency_measurement_service);