From a5574d3f67990bec5eb97637040ba2a953bf8778 Mon Sep 17 00:00:00 2001 From: Andrew Fitzgerald Date: Wed, 21 Aug 2024 11:37:57 -0500 Subject: [PATCH] remove disable_block_production_forwarding cli flag --- validator/src/cli.rs | 10 ---------- validator/src/main.rs | 5 +---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/validator/src/cli.rs b/validator/src/cli.rs index 9f4276d8d67ee0..74b8fa0b9a6d47 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -1553,16 +1553,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> { .possible_values(BlockProductionMethod::cli_names()) .help(BlockProductionMethod::cli_message()), ) - .arg( - Arg::with_name("disable_block_production_forwarding") - .long("disable-block-production-forwarding") - .requires("staked_nodes_overrides") - .takes_value(false) - .help("Disable forwarding of non-vote transactions in block production. \ - By default, forwarding is already disabled, it is enabled by setting \ - \"staked-nodes-overrides\". This flag can be used to disable forwarding \ - even when \"staked-nodes-overrides\" is set."), - ) .arg( Arg::with_name("unified_scheduler_handler_threads") .long("unified-scheduler-handler-threads") diff --git a/validator/src/main.rs b/validator/src/main.rs index 349f01ecace8d7..452b9e652596da 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -1783,10 +1783,7 @@ pub fn main() { BlockProductionMethod ) .unwrap_or_default(); - validator_config.enable_block_production_forwarding = staked_nodes_overrides_path - .as_ref() - .map(|_| !matches.is_present("disable_block_production_forwarding")) - .unwrap_or_default(); + validator_config.enable_block_production_forwarding = staked_nodes_overrides_path.is_some(); validator_config.unified_scheduler_handler_threads = value_t!(matches, "unified_scheduler_handler_threads", usize).ok();