mirror of
https://github.com/sigp/lighthouse.git
synced 2026-06-29 10:54:24 +00:00
Deprecate http-spec-fork and http-allow-sync-stalled (#5500)
* deprecate flags * fmt * remove backslash * remove hidden flags from the book * Merge branch 'unstable' of https://github.com/sigp/lighthouse into deprecate-http-spec-fork-and-http-allow-sync-stalled * add warn, re-add tests * Apply suggestions from code review * Merge remote-tracking branch 'origin/unstable' into deprecate-http-spec-fork-and-http-allow-sync-stalled * Fix imports
This commit is contained in:
@@ -144,7 +144,6 @@ pub struct Config {
|
||||
pub listen_port: u16,
|
||||
pub allow_origin: Option<String>,
|
||||
pub tls_config: Option<TlsConfig>,
|
||||
pub allow_sync_stalled: bool,
|
||||
pub spec_fork_name: Option<ForkName>,
|
||||
pub data_dir: PathBuf,
|
||||
pub sse_capacity_multiplier: usize,
|
||||
@@ -162,7 +161,6 @@ impl Default for Config {
|
||||
listen_port: 5052,
|
||||
allow_origin: None,
|
||||
tls_config: None,
|
||||
allow_sync_stalled: false,
|
||||
spec_fork_name: None,
|
||||
data_dir: PathBuf::from(DEFAULT_ROOT_DIR),
|
||||
sse_capacity_multiplier: 1,
|
||||
@@ -321,7 +319,6 @@ pub fn serve<T: BeaconChainTypes>(
|
||||
shutdown: impl Future<Output = ()> + Send + Sync + 'static,
|
||||
) -> Result<HttpServer, Error> {
|
||||
let config = ctx.config.clone();
|
||||
let allow_sync_stalled = config.allow_sync_stalled;
|
||||
let log = ctx.log.clone();
|
||||
|
||||
// Configure CORS.
|
||||
@@ -482,10 +479,7 @@ pub fn serve<T: BeaconChainTypes>(
|
||||
| SyncState::SyncTransition
|
||||
| SyncState::BackFillSyncing { .. } => Ok(()),
|
||||
SyncState::Synced => Ok(()),
|
||||
SyncState::Stalled if allow_sync_stalled => Ok(()),
|
||||
SyncState::Stalled => Err(warp_utils::reject::not_synced(
|
||||
"sync is stalled".to_string(),
|
||||
)),
|
||||
SyncState::Stalled => Ok(()),
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
@@ -392,9 +392,9 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
|
||||
.long("http-spec-fork")
|
||||
.requires("enable_http")
|
||||
.value_name("FORK")
|
||||
.help("Serve the spec for a specific hard fork on /eth/v1/config/spec. It should \
|
||||
not be necessary to set this flag.")
|
||||
.help("This flag is deprecated and has no effect.")
|
||||
.takes_value(true)
|
||||
.hidden(true)
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("http-enable-tls")
|
||||
@@ -425,9 +425,8 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
|
||||
Arg::with_name("http-allow-sync-stalled")
|
||||
.long("http-allow-sync-stalled")
|
||||
.requires("enable_http")
|
||||
.help("Forces the HTTP to indicate that the node is synced when sync is actually \
|
||||
stalled. This is useful for very small testnets. TESTING ONLY. DO NOT USE ON \
|
||||
MAINNET.")
|
||||
.help("This flag is deprecated and has no effect.")
|
||||
.hidden(true)
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("http-sse-capacity-multiplier")
|
||||
|
||||
@@ -128,8 +128,12 @@ pub fn get_config<E: EthSpec>(
|
||||
client_config.http_api.allow_origin = Some(allow_origin.to_string());
|
||||
}
|
||||
|
||||
if let Some(fork_name) = clap_utils::parse_optional(cli_args, "http-spec-fork")? {
|
||||
client_config.http_api.spec_fork_name = Some(fork_name);
|
||||
if cli_args.is_present("http-spec-fork") {
|
||||
warn!(
|
||||
log,
|
||||
"Ignoring --http-spec-fork";
|
||||
"info" => "this flag is deprecated and will be removed"
|
||||
);
|
||||
}
|
||||
|
||||
if cli_args.is_present("http-enable-tls") {
|
||||
@@ -148,7 +152,11 @@ pub fn get_config<E: EthSpec>(
|
||||
}
|
||||
|
||||
if cli_args.is_present("http-allow-sync-stalled") {
|
||||
client_config.http_api.allow_sync_stalled = true;
|
||||
warn!(
|
||||
log,
|
||||
"Ignoring --http-allow-sync-stalled";
|
||||
"info" => "this flag is deprecated and will be removed"
|
||||
);
|
||||
}
|
||||
|
||||
client_config.http_api.sse_capacity_multiplier =
|
||||
|
||||
Reference in New Issue
Block a user