Merge branch 'unstable' into dvt

This commit is contained in:
chonghe
2025-04-01 18:17:06 +08:00
committed by GitHub
9 changed files with 9 additions and 9 deletions

View File

@@ -166,7 +166,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--graffiti <GRAFFITI> --graffiti <GRAFFITI>
Specify your custom graffiti to be included in blocks. Defaults to the Specify your custom graffiti to be included in blocks. Defaults to the
current version and commit, truncated to fit in 32 bytes. current version and commit, truncated to fit in 32 bytes.

View File

@@ -51,7 +51,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--log-format <FORMAT> --log-format <FORMAT>
Specifies the log format used when emitting logs to the terminal. Specifies the log format used when emitting logs to the terminal.
[possible values: JSON] [possible values: JSON]

View File

@@ -49,7 +49,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--graffiti <GRAFFITI> --graffiti <GRAFFITI>
Specify your custom graffiti to be included in blocks. Specify your custom graffiti to be included in blocks.
--graffiti-file <GRAFFITI-FILE> --graffiti-file <GRAFFITI-FILE>

View File

@@ -48,7 +48,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--log-format <FORMAT> --log-format <FORMAT>
Specifies the log format used when emitting logs to the terminal. Specifies the log format used when emitting logs to the terminal.
[possible values: JSON] [possible values: JSON]

View File

@@ -55,7 +55,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--log-format <FORMAT> --log-format <FORMAT>
Specifies the log format used when emitting logs to the terminal. Specifies the log format used when emitting logs to the terminal.
[possible values: JSON] [possible values: JSON]

View File

@@ -36,7 +36,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--keystore-file <PATH_TO_KEYSTORE_FILE> --keystore-file <PATH_TO_KEYSTORE_FILE>
The path to a keystore JSON file to be imported to the validator The path to a keystore JSON file to be imported to the validator
client. This file is usually created using staking-deposit-cli or client. This file is usually created using staking-deposit-cli or

View File

@@ -44,7 +44,7 @@ Options:
then this value will be ignored. then this value will be ignored.
--genesis-state-url-timeout <SECONDS> --genesis-state-url-timeout <SECONDS>
The timeout in seconds for the request to --genesis-state-url. The timeout in seconds for the request to --genesis-state-url.
[default: 180] [default: 300]
--log-format <FORMAT> --log-format <FORMAT>
Specifies the log format used when emitting logs to the terminal. Specifies the log format used when emitting logs to the terminal.
[possible values: JSON] [possible values: JSON]

View File

@@ -411,7 +411,7 @@ fn main() {
"The timeout in seconds for the request to --genesis-state-url.", "The timeout in seconds for the request to --genesis-state-url.",
) )
.action(ArgAction::Set) .action(ArgAction::Set)
.default_value("180") .default_value("300")
.global(true) .global(true)
.display_order(0) .display_order(0)
) )

View File

@@ -2758,7 +2758,7 @@ fn genesis_state_url_default() {
.run_with_zero_port() .run_with_zero_port()
.with_config(|config| { .with_config(|config| {
assert_eq!(config.genesis_state_url, None); assert_eq!(config.genesis_state_url, None);
assert_eq!(config.genesis_state_url_timeout, Duration::from_secs(180)); assert_eq!(config.genesis_state_url_timeout, Duration::from_secs(300));
}); });
} }