jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(op-reth): --chain help message (#10661)

Browse Source
This commit is contained in:
Arsenii Kulikov
2024-09-02 20:46:32 +04:00
committed by GitHub
parent d58cf53850
commit cbad38a40f
8 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/cli/cli/src/chainspec.rs
View File

@ -55,4 +55,9 @@ pub trait ChainSpecParser: Clone + Send + Sync + 'static {
fn parser() -> impl TypedValueParser<Value = Arc<Self::ChainSpec>> {
Parser(std::marker::PhantomData::<Self>)
}
/// Produces a help message for the chain spec argument.
fn help_messge() -> String {
format!("The chain this node is running.\nPossible values are either a built-in chain or the path to a chain specification file.\n\nBuilt-in chains:\n {}", Self::SUPPORTED_CHAINS.join(", "))
}
}

4
crates/cli/commands/src/common.rs
View File

@ -10,7 +10,7 @@ use reth_db_common::init::init_genesis;
use reth_downloaders::{bodies::noop::NoopBodiesDownloader, headers::noop::NoopHeaderDownloader};
use reth_evm::noop::NoopBlockExecutorProvider;
use reth_node_core::{
args::{utils::chain_help, DatabaseArgs, DatadirArgs},
args::{DatabaseArgs, DatadirArgs},
dirs::{ChainPath, DataDirPath},
};
use reth_primitives::B256;
@ -38,7 +38,7 @@ pub struct EnvironmentArgs<C: ChainSpecParser> {
#[arg(
long,
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
long_help = C::help_messge(),
default_value = C::SUPPORTED_CHAINS[0],
value_parser = C::parser()
)]

3
crates/cli/commands/src/dump_genesis.rs
View File

@ -4,7 +4,6 @@ use std::sync::Arc;
use clap::Parser;
use reth_chainspec::ChainSpec;
use reth_cli::chainspec::ChainSpecParser;
use reth_node_core::args::utils::chain_help;
/// Dumps genesis block JSON configuration to stdout
#[derive(Debug, Parser)]
@ -15,7 +14,7 @@ pub struct DumpGenesisCommand<C: ChainSpecParser> {
#[arg(
long,
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
long_help = C::help_messge(),
default_value = C::SUPPORTED_CHAINS[0],
value_parser = C::parser()
)]

7
crates/cli/commands/src/node.rs
View File

@ -9,9 +9,8 @@ use reth_db::{init_db, DatabaseEnv};
use reth_node_builder::{NodeBuilder, WithLaunchContext};
use reth_node_core::{
args::{
utils::{chain_help, DefaultChainSpecParser},
DatabaseArgs, DatadirArgs, DebugArgs, DevArgs, NetworkArgs, PayloadBuilderArgs,
PruningArgs, RpcServerArgs, TxPoolArgs,
utils::DefaultChainSpecParser, DatabaseArgs, DatadirArgs, DebugArgs, DevArgs, NetworkArgs,
PayloadBuilderArgs, PruningArgs, RpcServerArgs, TxPoolArgs,
},
node_config::NodeConfig,
version,
@ -35,7 +34,7 @@ pub struct NodeCommand<
#[arg(
long,
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
long_help = C::help_messge(),
default_value = C::SUPPORTED_CHAINS[0],
default_value_if("dev", "true", "dev"),
value_parser = C::parser(),

4
crates/cli/commands/src/p2p/mod.rs
View File

@ -11,7 +11,7 @@ use reth_config::Config;
use reth_network::{BlockDownloaderProvider, NetworkConfigBuilder};
use reth_network_p2p::bodies::client::BodiesClient;
use reth_node_core::{
args::{utils::chain_help, DatabaseArgs, DatadirArgs, NetworkArgs},
args::{DatabaseArgs, DatadirArgs, NetworkArgs},
utils::get_single_header,
};
use reth_primitives::BlockHashOrNumber;
@ -31,7 +31,7 @@ pub struct Command<C: ChainSpecParser> {
#[arg(
long,
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
long_help = C::help_messge(),
default_value = C::SUPPORTED_CHAINS[0],
value_parser = C::parser()
)]