gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-27 01:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated flags in prep for v6.0.0 (#6490)

Browse Source 
* Delete previously deprecated flags

* Update CLI docs

* Remove deprecated BN flags

* Use ethereum-package main branch

* Delete env_log/-l
This commit is contained in:
Michael Sproul
2024-10-18 15:21:46 +11:00
committed by GitHub
parent d1fda938a3
commit 6ad2c187dd
16 changed files with 4 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_node/http_api/src/lib.rs
View File

@@ -146,7 +146,6 @@ pub struct Config {
pub listen_port: u16,
pub allow_origin: Option<String>,
pub tls_config: Option<TlsConfig>,
pub spec_fork_name: Option<ForkName>,
pub data_dir: PathBuf,
pub sse_capacity_multiplier: usize,
pub enable_beacon_processor: bool,
@@ -164,7 +163,6 @@ impl Default for Config {
listen_port: 5052,
allow_origin: None,
tls_config: None,
spec_fork_name: None,
data_dir: PathBuf::from(DEFAULT_ROOT_DIR),
sse_capacity_multiplier: 1,
enable_beacon_processor: true,
@@ -2643,7 +2641,6 @@ pub fn serve<T: BeaconChainTypes>(
);
// GET config/spec
let spec_fork_name = ctx.config.spec_fork_name;
let get_config_spec = config_path
.and(warp::path("spec"))
.and(warp::path::end())
@@ -2653,7 +2650,7 @@ pub fn serve<T: BeaconChainTypes>(
move |task_spawner: TaskSpawner<T::EthSpec>, chain: Arc<BeaconChain<T>>| {
task_spawner.blocking_json_task(Priority::P0, move || {
let config_and_preset =
ConfigAndPreset::from_chain_spec::<T::EthSpec>(&chain.spec, spec_fork_name);
ConfigAndPreset::from_chain_spec::<T::EthSpec>(&chain.spec, None);
Ok(api_types::GenericResponse::from(config_and_preset))
})
},

12
beacon_node/operation_pool/src/attestation_id.rs
View File

@@ -1,12 +0,0 @@
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
/// Serialized `AttestationData` augmented with a domain to encode the fork info.
///
/// [DEPRECATED] To be removed once all nodes have updated to schema v12.
#[derive(
PartialEq, Eq, Clone, Hash, Debug, PartialOrd, Ord, Encode, Decode, Serialize, Deserialize,
)]
pub struct AttestationId {
v: Vec<u8>,
}

1
beacon_node/operation_pool/src/lib.rs
View File

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

61
beacon_node/src/cli.rs
View File

@@ -401,15 +401,6 @@ pub fn cli_app() -> Command {
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("self-limiter")
.long("self-limiter")
.help("This flag is deprecated and has no effect.")
.hide(true)
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("disable-self-limiter")
.long("disable-self-limiter")
@@ -525,16 +516,6 @@ pub fn cli_app() -> Command {
.action(ArgAction::Set)
.display_order(0)
)
.arg(
Arg::new("http-spec-fork")
.long("http-spec-fork")
.requires("enable_http")
.value_name("FORK")
.help("This flag is deprecated and has no effect.")
.hide(true)
.action(ArgAction::Set)
.display_order(0)
)
.arg(
Arg::new("http-enable-tls")
.long("http-enable-tls")
@@ -564,16 +545,6 @@ pub fn cli_app() -> Command {
.action(ArgAction::Set)
.display_order(0)
)
.arg(
Arg::new("http-allow-sync-stalled")
.long("http-allow-sync-stalled")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.requires("enable_http")
.help("This flag is deprecated and has no effect.")
.hide(true)
.display_order(0)
)
.arg(
Arg::new("http-sse-capacity-multiplier")
.long("http-sse-capacity-multiplier")
@@ -1291,14 +1262,6 @@ pub fn cli_app() -> Command {
.action(ArgAction::Set)
.display_order(0)
)
.arg(
Arg::new("disable-lock-timeouts")
.long("disable-lock-timeouts")
.help("This flag is deprecated and has no effect.")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("disable-proposer-reorgs")
.long("disable-proposer-reorgs")
@@ -1511,14 +1474,6 @@ pub fn cli_app() -> Command {
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("always-prefer-builder-payload")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.long("always-prefer-builder-payload")
.help("This flag is deprecated and has no effect.")
.display_order(0)
)
.arg(
Arg::new("invalid-gossip-verified-blocks-path")
.action(ArgAction::Set)
@@ -1530,14 +1485,6 @@ pub fn cli_app() -> Command {
filling up their disks.")
.display_order(0)
)
.arg(
Arg::new("progressive-balances")
.long("progressive-balances")
.value_name("MODE")
.help("Deprecated. This optimisation is now the default and cannot be disabled.")
.action(ArgAction::Set)
.display_order(0)
)
.arg(
Arg::new("beacon-processor-max-workers")
.long("beacon-processor-max-workers")
@@ -1599,13 +1546,5 @@ pub fn cli_app() -> Command {
.action(ArgAction::Set)
.display_order(0)
)
.arg(
Arg::new("disable-duplicate-warn-logs")
.long("disable-duplicate-warn-logs")
.help("This flag is deprecated and has no effect.")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.display_order(0)
)
.group(ArgGroup::new("enable_http").args(["http", "gui", "staking"]).multiple(true))
}

40
beacon_node/src/config.rs
View File

@@ -152,14 +152,6 @@ pub fn get_config<E: EthSpec>(
client_config.http_api.allow_origin = Some(allow_origin.to_string());
}
if cli_args.get_one::<String>("http-spec-fork").is_some() {
warn!(
log,
"Ignoring --http-spec-fork";
"info" => "this flag is deprecated and will be removed"
);
}
if cli_args.get_flag("http-enable-tls") {
client_config.http_api.tls_config = Some(TlsConfig {
cert: cli_args
@@ -175,14 +167,6 @@ pub fn get_config<E: EthSpec>(
});
}
if cli_args.get_flag("http-allow-sync-stalled") {
warn!(
log,
"Ignoring --http-allow-sync-stalled";
"info" => "this flag is deprecated and will be removed"
);
}
client_config.http_api.sse_capacity_multiplier =
parse_required(cli_args, "http-sse-capacity-multiplier")?;
@@ -362,14 +346,6 @@ pub fn get_config<E: EthSpec>(
.map(Duration::from_millis);
}
if cli_args.get_flag("always-prefer-builder-payload") {
warn!(
log,
"Ignoring --always-prefer-builder-payload";
"info" => "this flag is deprecated and will be removed"
);
}
// Set config values from parse values.
el_config.secret_file = Some(secret_file.clone());
el_config.execution_endpoint = Some(execution_endpoint.clone());
@@ -787,14 +763,6 @@ pub fn get_config<E: EthSpec>(
.individual_tracking_threshold = count;
}
if cli_args.get_flag("disable-lock-timeouts") {
warn!(
log,
"Ignoring --disable-lock-timeouts";
"info" => "this flag is deprecated and will be removed"
);
}
if cli_args.get_flag("disable-proposer-reorgs") {
client_config.chain.re_org_head_threshold = None;
client_config.chain.re_org_parent_threshold = None;
@@ -894,14 +862,6 @@ pub fn get_config<E: EthSpec>(
client_config.network.invalid_block_storage = Some(path);
}
if cli_args.get_one::<String>("progressive-balances").is_some() {
warn!(
log,
"Progressive balances mode is deprecated";
"info" => "please remove --progressive-balances"
);
}
if let Some(max_workers) = clap_utils::parse_optional(cli_args, "beacon-processor-max-workers")?
{
client_config.beacon_processor.max_workers = max_workers;