github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump strum (#6392)

Browse Source
This commit is contained in:
Matthias Seitz
2024-02-04 15:23:59 +01:00
committed by GitHub
parent 05c1d1d4a2
commit ae9158c95b
4 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/node-core/src/args/rpc_server_args.rs
View File

@@ -607,7 +607,7 @@ impl TypedValueParser for RpcModuleSelectionValueParser {
value.to_str().ok_or_else(|| clap::Error::new(clap::error::ErrorKind::InvalidUtf8))?;
val.parse::<RpcModuleSelection>().map_err(|err| {
let arg = arg.map(|a| a.to_string()).unwrap_or_else(|| "...".to_owned());
let possible_values = RethRpcModule::all_variants().to_vec().join(",");
let possible_values = RethRpcModule::all_variant_names().to_vec().join(",");
let msg = format!(
"Invalid value '{val}' for {arg}: {err}.\n [possible values: {possible_values}]"
);
@@ -616,7 +616,7 @@ impl TypedValueParser for RpcModuleSelectionValueParser {
}
fn possible_values(&self) -> Option<Box<dyn Iterator<Item = PossibleValue> + '_>> {
let values = RethRpcModule::all_variants().iter().map(PossibleValue::new);
let values = RethRpcModule::all_variant_names().iter().map(PossibleValue::new);
Some(Box::new(values))
}
}

18
crates/rpc/rpc-builder/src/lib.rs
View File

@@ -169,7 +169,7 @@ use jsonrpsee::{
};
use reth_node_api::{EngineTypes, EvmEnvConfig};
use serde::{Deserialize, Serialize, Serializer};
use strum::{AsRefStr, EnumIter, EnumVariantNames, IntoStaticStr, ParseError, VariantNames};
use strum::{AsRefStr, EnumIter, IntoStaticStr, ParseError, VariantArray, VariantNames};
use tower::layer::util::{Identity, Stack};
use tower_http::cors::CorsLayer;
use tracing::{instrument, trace};
@@ -628,9 +628,9 @@ impl RpcModuleSelection {
pub const STANDARD_MODULES: [RethRpcModule; 3] =
[RethRpcModule::Eth, RethRpcModule::Net, RethRpcModule::Web3];
/// Returns a selection of [RethRpcModule] with all [RethRpcModule::VARIANTS].
/// Returns a selection of [RethRpcModule] with all [RethRpcModule::all_variants].
pub fn all_modules() -> Vec<RethRpcModule> {
RpcModuleSelection::try_from_selection(RethRpcModule::VARIANTS.iter().copied())
RpcModuleSelection::try_from_selection(RethRpcModule::all_variants().iter().copied())
.expect("valid selection")
.into_selection()
}
@@ -823,7 +823,8 @@ impl fmt::Display for RpcModuleSelection {
Hash,
AsRefStr,
IntoStaticStr,
EnumVariantNames,
VariantNames,
VariantArray,
EnumIter,
Deserialize,
)]
@@ -860,9 +861,14 @@ pub enum RethRpcModule {
// === impl RethRpcModule ===
impl RethRpcModule {
/// Returns all variant names of the enum
pub const fn all_variant_names() -> &'static [&'static str] {
<Self as VariantNames>::VARIANTS
}
/// Returns all variants of the enum
pub const fn all_variants() -> &'static [&'static str] {
Self::VARIANTS
pub const fn all_variants() -> &'static [Self] {
<Self as VariantArray>::VARIANTS
}
/// Returns all variants of the enum