chore: moved the parsing of flag

Author: startup-dreamer

beacon_node/lighthouse_network/src/service/mod.rs

@@ -203,7 +203,8 @@ impl<E: EthSpec> Network<E> {
             if let Some(false_count) = config.advertise_false_custody_group_count {
                 false_count
             } else {
-                ctx.chain_spec.custody_group_count(config.subscribe_all_data_column_subnets)
+                ctx.chain_spec
+                    .custody_group_count(config.subscribe_all_data_column_subnets)
             }
         });
         let meta_data = utils::load_or_build_metadata(&config.network_dir, custody_group_count);

beacon_node/src/config.rs

@@ -30,7 +30,7 @@ use std::str::FromStr;
 use std::time::Duration;
 use tracing::{error, info, warn};
 use types::graffiti::GraffitiString;
-use types::{Checkpoint, Epoch, EthSpec, Hash256, PublicKeyBytes};
+use types::{ChainSpec, Checkpoint, Epoch, EthSpec, Hash256, PublicKeyBytes};
 
 const PURGE_DB_CONFIRMATION: &str = "confirm";
 
@@ -49,17 +49,6 @@ pub fn get_config<E: EthSpec>(
 
     let mut client_config = ClientConfig::default();
 
-    if let Some(false_custody_group_count) =
-        clap_utils::parse_optional::<u64>(cli_args, "advertise-false-custody-group-count")?
-    {
-        if false_custody_group_count > spec.number_of_custody_groups {
-            return Err(format!(
-                "advertise-false-custody-group-count ({}) exceeds number_of_custody_groups ({})",
-                false_custody_group_count, spec.number_of_custody_groups
-            ));
-        }
-    }
-
     // Update the client's data directory
     client_config.set_data_dir(get_data_dir(cli_args));
 
@@ -119,7 +108,12 @@ pub fn get_config<E: EthSpec>(
 
     let data_dir_ref = client_config.data_dir().clone();
 
-    set_network_config(&mut client_config.network, cli_args, &data_dir_ref)?;
+    set_network_config(
+        &mut client_config.network,
+        cli_args,
+        &data_dir_ref,
+        Some(spec),
+    )?;
 
     /*
      * Staking flag
@@ -1155,6 +1149,7 @@ pub fn set_network_config(
     config: &mut NetworkConfig,
     cli_args: &ArgMatches,
     data_dir: &Path,
+    spec: Option<&ChainSpec>,
 ) -> Result<(), String> {
     // If a network dir has been specified, override the `datadir` definition.
     if let Some(dir) = cli_args.get_one::<String>("network-dir") {
@@ -1184,6 +1179,14 @@ pub fn set_network_config(
     if let Some(false_custody_group_count) =
         clap_utils::parse_optional(cli_args, "advertise-false-custody-group-count")?
     {
+        if let Some(spec) = spec {
+            if false_custody_group_count > spec.number_of_custody_groups {
+                return Err(format!(
+                    "advertise-false-custody-group-count ({}) exceeds number_of_custody_groups ({})",
+                    false_custody_group_count, spec.number_of_custody_groups
+                ));
+            }
+        }
         config.advertise_false_custody_group_count = Some(false_custody_group_count);
     }
 

boot_node/src/config.rs

@@ -53,7 +53,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
 
         let mut network_config = NetworkConfig::default();
 
-        set_network_config(&mut network_config, matches, &data_dir)?;
+        set_network_config(&mut network_config, matches, &data_dir, None)?;
 
         // Set the Enr Discovery ports to the listening ports if not present.
         if let Some(listening_addr_v4) = network_config.listen_addrs().v4() {