|
27 | 27 | solana_cli_output::{CliAccount, CliAccountNewConfig, OutputFormat},
|
28 | 28 | solana_core::{
|
29 | 29 | system_monitor_service::{SystemMonitorService, SystemMonitorStatsReportConfig},
|
30 |
| - validator::{BlockProductionMethod, BlockVerificationMethod}, |
| 30 | + validator::BlockVerificationMethod, |
31 | 31 | },
|
32 | 32 | solana_entry::entry::Entry,
|
33 | 33 | solana_geyser_plugin_manager::geyser_plugin_service::GeyserPluginService,
|
@@ -1252,14 +1252,9 @@ fn load_bank_forks(
|
1252 | 1252 | "block_verification_method",
|
1253 | 1253 | BlockVerificationMethod
|
1254 | 1254 | );
|
1255 |
| - let block_production_method = value_t_or_exit!( |
1256 |
| - arg_matches, |
1257 |
| - "block_production_method", |
1258 |
| - BlockProductionMethod |
1259 |
| - ); |
1260 | 1255 | info!(
|
1261 |
| - "Using: block-verification-method: {}, block-production-method: {}", |
1262 |
| - block_verification_method, block_production_method |
| 1256 | + "Using: block-verification-method: {}", |
| 1257 | + block_verification_method, |
1263 | 1258 | );
|
1264 | 1259 |
|
1265 | 1260 | let (snapshot_request_sender, snapshot_request_receiver) = crossbeam_channel::unbounded();
|
@@ -1655,10 +1650,7 @@ fn main() {
|
1655 | 1650 | .to_string();
|
1656 | 1651 | let default_graph_vote_account_mode = GraphVoteAccountMode::default();
|
1657 | 1652 |
|
1658 |
| - let (block_verification_method_help, block_production_method_help) = ( |
1659 |
| - &BlockVerificationMethod::cli_message(), |
1660 |
| - &BlockProductionMethod::cli_message(), |
1661 |
| - ); |
| 1653 | + let block_verification_method_help = &BlockVerificationMethod::cli_message(); |
1662 | 1654 |
|
1663 | 1655 | let mut measure_total_execution_time = Measure::start("ledger tool");
|
1664 | 1656 |
|
@@ -1727,16 +1719,6 @@ fn main() {
|
1727 | 1719 | .hidden(hidden_unless_forced())
|
1728 | 1720 | .help(block_verification_method_help),
|
1729 | 1721 | )
|
1730 |
| - .arg( |
1731 |
| - Arg::with_name("block_production_method") |
1732 |
| - .long("block-production-method") |
1733 |
| - .value_name("METHOD") |
1734 |
| - .takes_value(true) |
1735 |
| - .possible_values(BlockProductionMethod::cli_names()) |
1736 |
| - .global(true) |
1737 |
| - .hidden(hidden_unless_forced()) |
1738 |
| - .help(block_production_method_help), |
1739 |
| - ) |
1740 | 1722 | .arg(
|
1741 | 1723 | Arg::with_name("output_format")
|
1742 | 1724 | .long("output")
|
|
0 commit comments