chore: remove serde from ChainSpec (#9017)

This commit is contained in:
joshieDo
2024-06-21 17:29:37 +02:00
committed by GitHub
parent b9b61b377a
commit 2473ed880b
10 changed files with 17 additions and 25 deletions

View File

@ -2,7 +2,7 @@
use crate::{
args::{
utils::{chain_help, genesis_value_parser, SUPPORTED_CHAINS},
utils::{chain_help, chain_value_parser, SUPPORTED_CHAINS},
LogArgs,
},
commands::{
@ -46,7 +46,7 @@ pub struct Cli<Ext: clap::Args + fmt::Debug = NoArgs> {
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
default_value = SUPPORTED_CHAINS[0],
value_parser = genesis_value_parser,
value_parser = chain_value_parser,
global = true,
)]
chain: Arc<ChainSpec>,

View File

@ -10,7 +10,7 @@ use reth_downloaders::{bodies::noop::NoopBodiesDownloader, headers::noop::NoopHe
use reth_evm::noop::NoopBlockExecutorProvider;
use reth_node_core::{
args::{
utils::{chain_help, genesis_value_parser, SUPPORTED_CHAINS},
utils::{chain_help, chain_value_parser, SUPPORTED_CHAINS},
DatabaseArgs, DatadirArgs,
},
dirs::{ChainPath, DataDirPath},
@ -42,7 +42,7 @@ pub struct EnvironmentArgs {
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
default_value = SUPPORTED_CHAINS[0],
value_parser = genesis_value_parser
value_parser = chain_value_parser
)]
pub chain: Arc<ChainSpec>,

View File

@ -1,5 +1,5 @@
//! Command that dumps genesis block JSON configuration to stdout
use crate::args::utils::{chain_help, genesis_value_parser, SUPPORTED_CHAINS};
use crate::args::utils::{chain_help, chain_value_parser, SUPPORTED_CHAINS};
use clap::Parser;
use reth_chainspec::ChainSpec;
use std::sync::Arc;
@ -15,7 +15,7 @@ pub struct DumpGenesisCommand {
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
default_value = SUPPORTED_CHAINS[0],
value_parser = genesis_value_parser
value_parser = chain_value_parser
)]
chain: Arc<ChainSpec>,
}

View File

@ -1,7 +1,7 @@
//! Main node command for launching a node
use crate::args::{
utils::{chain_help, genesis_value_parser, parse_socket_address, SUPPORTED_CHAINS},
utils::{chain_help, chain_value_parser, parse_socket_address, SUPPORTED_CHAINS},
DatabaseArgs, DatadirArgs, DebugArgs, DevArgs, NetworkArgs, PayloadBuilderArgs, PruningArgs,
RpcServerArgs, TxPoolArgs,
};
@ -29,7 +29,7 @@ pub struct NodeCommand<Ext: clap::Args + fmt::Debug = NoArgs> {
long_help = chain_help(),
default_value = SUPPORTED_CHAINS[0],
default_value_if("dev", "true", "dev"),
value_parser = genesis_value_parser,
value_parser = chain_value_parser,
required = false,
)]
pub chain: Arc<ChainSpec>,

View File

@ -3,7 +3,7 @@
use crate::{
args::{
get_secret_key,
utils::{chain_help, genesis_value_parser, hash_or_num_value_parser, SUPPORTED_CHAINS},
utils::{chain_help, chain_value_parser, hash_or_num_value_parser, SUPPORTED_CHAINS},
DatabaseArgs, DiscoveryArgs, NetworkArgs,
},
utils::get_single_header,
@ -40,7 +40,7 @@ pub struct Command {
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
default_value = SUPPORTED_CHAINS[0],
value_parser = genesis_value_parser
value_parser = chain_value_parser
)]
chain: Arc<ChainSpec>,