From 1b5c6140e2f2a6a54b4074f1a933cc5e92e7c14d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 12:33:40 -0500
Subject: [PATCH] v2.0: remove disable_block_production_forwarding cli flag
 (backport of #2687) (#2909)

remove disable_block_production_forwarding cli flag (#2687)

(cherry picked from commit df892c42418047ade3365c1b3ddcf6c45f95d1f1)

Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.com>
---
 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 e769d11c3c3394..d2b70583d20592 100644
--- a/validator/src/cli.rs
+++ b/validator/src/cli.rs
@@ -1533,16 +1533,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 99abf814aed687..8467bcaa9d2570 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -1769,10 +1769,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();