Skip to content

v2.0: remove disable_block_production_forwarding cli flag (backport of #2687) #2909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apfitzge merged 1 commit into from
Sep 12, 2024
Merged

v2.0: remove disable_block_production_forwarding cli flag (backport of #2687) #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions validator/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 1 addition & 4 deletions validator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down