mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 11:41:51 +00:00
Enable the outbound rate limiter by default, and update blobs method quotas (#6093)
* Enable the outbound rate limiter by default, and update blobs method quotas. * Lint and book updates.
This commit is contained in:
@@ -372,17 +372,22 @@ pub fn cli_app() -> Command {
|
||||
.arg(
|
||||
Arg::new("self-limiter")
|
||||
.long("self-limiter")
|
||||
.help(
|
||||
"Enables the outbound rate limiter (requests made by this node). \
|
||||
Use the self-limiter-protocol flag to set per protocol configurations. \
|
||||
If the self rate limiter is enabled and a protocol is not \
|
||||
present in the configuration, the quotas used for the inbound rate limiter will be \
|
||||
used."
|
||||
)
|
||||
.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")
|
||||
.help(
|
||||
"Disables the outbound rate limiter (requests sent by this node)."
|
||||
)
|
||||
.action(ArgAction::SetTrue)
|
||||
.help_heading(FLAG_HEADER)
|
||||
.display_order(0)
|
||||
)
|
||||
.arg(
|
||||
Arg::new("self-limiter-protocols")
|
||||
.long("self-limiter-protocols")
|
||||
@@ -397,7 +402,7 @@ pub fn cli_app() -> Command {
|
||||
)
|
||||
.action(ArgAction::Append)
|
||||
.value_delimiter(';')
|
||||
.requires("self-limiter")
|
||||
.conflicts_with("disable-self-limiter")
|
||||
.display_order(0)
|
||||
)
|
||||
.arg(
|
||||
|
||||
@@ -1416,16 +1416,15 @@ pub fn set_network_config(
|
||||
// Light client server config.
|
||||
config.enable_light_client_server = parse_flag(cli_args, "light-client-server");
|
||||
|
||||
// The self limiter is disabled by default. If the `self-limiter` flag is provided
|
||||
// without the `self-limiter-protocols` flag, the default params will be used.
|
||||
if parse_flag(cli_args, "self-limiter") {
|
||||
config.outbound_rate_limiter_config =
|
||||
if let Some(protocols) = cli_args.get_one::<String>("self-limiter-protocols") {
|
||||
Some(protocols.parse()?)
|
||||
} else {
|
||||
Some(Default::default())
|
||||
};
|
||||
}
|
||||
// The self limiter is enabled by default. If the `self-limiter-protocols` flag is not provided,
|
||||
// the default params will be used.
|
||||
config.outbound_rate_limiter_config = if parse_flag(cli_args, "disable-self-limiter") {
|
||||
None
|
||||
} else if let Some(protocols) = cli_args.get_one::<String>("self-limiter-protocols") {
|
||||
Some(protocols.parse()?)
|
||||
} else {
|
||||
Some(Default::default())
|
||||
};
|
||||
|
||||
// Proposer-only mode overrides a number of previous configuration parameters.
|
||||
// Specifically, we avoid subscribing to long-lived subnets and wish to maintain a minimal set
|
||||
|
||||
Reference in New Issue
Block a user