Remove deprecated flags in prep for v6.0.0

beacon_node/operation_pool/src/lib.rs

@@ -1,5 +1,4 @@
 mod attestation;
-mod attestation_id;
 mod attestation_storage;
 mod attester_slashing;
 mod bls_to_execution_changes;

book/src/help_vc.md

@@ -210,12 +210,6 @@ Flags:
           If present, do not configure the system allocator. Providing this flag
           will generally increase memory usage, it should only be provided when
           debugging specific memory allocation issues.
-      --disable-run-on-all
-          DEPRECATED. Use --broadcast. By default, Lighthouse publishes
-          attestation, sync committee subscriptions and proposer preparation
-          messages to all beacon nodes provided in the `--beacon-nodes flag`.
-          This option changes that behaviour such that these api calls only go
-          out to the first available and synced beacon node
       --disable-slashing-protection-web3signer
           Disable Lighthouse's slashing protection for all web3signer keys. This
           can reduce the I/O burden on the VC but is only safe if slashing
@@ -280,8 +274,6 @@ Flags:
       --prefer-builder-proposals
           If this flag is set, Lighthouse will always prefer blocks constructed
           by builders, regardless of payload value.
-      --produce-block-v3
-          This flag is deprecated and is no longer in use.
       --stdin-inputs
           If present, read all user inputs from stdin instead of tty.
       --unencrypted-http-transport

book/src/redundancy.md

@@ -74,8 +74,7 @@ lighthouse bn \
 Prior to v3.2.0 fallback beacon nodes also required the `--subscribe-all-subnets` and
 `--import-all-attestations` flags. These flags are no longer required as the validator client will
 now broadcast subscriptions to all connected beacon nodes by default. This broadcast behaviour
-can be disabled using the `--broadcast none` flag for `lighthouse vc` (or `--disable-run-on-all`
-[deprecated]).
+can be disabled using the `--broadcast none` flag for `lighthouse vc`.
 
 ### Broadcast modes
 

lighthouse/tests/validator_client.rs

@@ -426,13 +426,6 @@ fn no_doppelganger_protection_flag() {
         .with_config(|config| assert!(!config.enable_doppelganger_protection));
 }
 
-#[test]
-fn produce_block_v3_flag() {
-    // The flag is DEPRECATED but providing it should not trigger an error.
-    // We can delete this test when deleting the flag entirely.
-    CommandLineTest::new().flag("produce-block-v3", None).run();
-}
-
 #[test]
 fn no_gas_limit_flag() {
     CommandLineTest::new()
@@ -513,23 +506,6 @@ fn monitoring_endpoint() {
             assert_eq!(api_conf.update_period_secs, Some(30));
         });
 }
-#[test]
-fn disable_run_on_all_flag() {
-    CommandLineTest::new()
-        .flag("disable-run-on-all", None)
-        .run()
-        .with_config(|config| {
-            assert_eq!(config.broadcast_topics, vec![]);
-        });
-    // --broadcast flag takes precedence
-    CommandLineTest::new()
-        .flag("disable-run-on-all", None)
-        .flag("broadcast", Some("attestations"))
-        .run()
-        .with_config(|config| {
-            assert_eq!(config.broadcast_topics, vec![ApiTopic::Attestations]);
-        });
-}
 
 #[test]
 fn no_broadcast_flag() {
@@ -623,16 +599,6 @@ fn disable_latency_measurement_service() {
             assert!(!config.enable_latency_measurement_service);
         });
 }
-#[test]
-fn latency_measurement_service() {
-    // This flag is DEPRECATED so has no effect, but should still be accepted.
-    CommandLineTest::new()
-        .flag("latency-measurement-service", Some("false"))
-        .run()
-        .with_config(|config| {
-            assert!(config.enable_latency_measurement_service);
-        });
-}
 
 #[test]
 fn validator_registration_batch_size() {

validator_client/src/cli.rs

@@ -39,20 +39,6 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        // TODO remove this flag in a future release
-        .arg(
-            Arg::new("disable-run-on-all")
-                .long("disable-run-on-all")
-                .value_name("DISABLE_RUN_ON_ALL")
-                .help("DEPRECATED. Use --broadcast. \
-                       By default, Lighthouse publishes attestation, sync committee subscriptions \
-                       and proposer preparation messages to all beacon nodes provided in the \
-                       `--beacon-nodes flag`. This option changes that behaviour such that these \
-                       api calls only go out to the first available and synced beacon node")
-                .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-                .display_order(0)
-        )
         .arg(
             Arg::new("broadcast")
                 .long("broadcast")
@@ -167,14 +153,6 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("produce-block-v3")
-                .long("produce-block-v3")
-                .help("This flag is deprecated and is no longer in use.")
-                .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-                .display_order(0)
-        )
         .arg(
             Arg::new("distributed")
                 .long("distributed")
@@ -403,15 +381,6 @@ pub fn cli_app() -> Command {
                 .help_heading(FLAG_HEADER)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("latency-measurement-service")
-                .long("latency-measurement-service")
-                .help("DEPRECATED")
-                .action(ArgAction::Set)
-                .help_heading(FLAG_HEADER)
-                .display_order(0)
-                .hide(true)
-        )
         .arg(
             Arg::new("validator-registration-batch-size")
                 .long("validator-registration-batch-size")

validator_client/src/config.rs

@@ -244,14 +244,6 @@ impl Config {
             config.distributed = true;
         }
 
-        if cli_args.get_flag("disable-run-on-all") {
-            warn!(
-                log,
-                "The --disable-run-on-all flag is deprecated";
-                "msg" => "please use --broadcast instead"
-            );
-            config.broadcast_topics = vec![];
-        }
         if let Some(broadcast_topics) = cli_args.get_one::<String>("broadcast") {
             config.broadcast_topics = broadcast_topics
                 .split(',')
@@ -397,14 +389,6 @@ impl Config {
             config.prefer_builder_proposals = true;
         }
 
-        if cli_args.get_flag("produce-block-v3") {
-            warn!(
-                log,
-                "produce-block-v3 flag";
-                "note" => "deprecated flag has no effect and should be removed"
-            );
-        }
-
         config.gas_limit = cli_args
             .get_one::<String>("gas-limit")
             .map(|gas_limit| {
@@ -429,17 +413,6 @@ impl Config {
         config.enable_latency_measurement_service =
             !cli_args.get_flag("disable-latency-measurement-service");
 
-        if cli_args
-            .get_one::<String>("latency-measurement-service")
-            .is_some()
-        {
-            warn!(
-                log,
-                "latency-measurement-service flag";
-                "note" => "deprecated flag has no effect and should be removed"
-            );
-        }
-
         config.validator_registration_batch_size =
             parse_required(cli_args, "validator-registration-batch-size")?;
         if config.validator_registration_batch_size == 0 {