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

refactor: remove duplicate RPC namespaces from arguments (#4418)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Alp Güneysel
2023-09-19 06:51:14 -04:00
committed by GitHub
parent 11ee5d7530
commit d846199525
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,11 @@ impl RpcModuleSelection {
Self::all_modules()
}
/// Creates a new [RpcModuleSelection::Selection] from the given items.
/// Creates a new _unique_ [RpcModuleSelection::Selection] from the given items.
///
/// # Note
///
/// This will dedupe the selection and remove duplicates while preserving the order.
///
/// # Example
///
@ -516,14 +520,30 @@ impl RpcModuleSelection {
/// let config = RpcModuleSelection::try_from_selection(selection).unwrap();
/// assert_eq!(config, RpcModuleSelection::Selection(vec![RethRpcModule::Eth, RethRpcModule::Admin]));
/// ```
///
/// Create a unique selection from the [RethRpcModule] string identifiers
///
/// ```
/// use reth_rpc_builder::{RethRpcModule, RpcModuleSelection};
/// let selection = vec!["eth", "admin", "eth", "admin"];
/// let config = RpcModuleSelection::try_from_selection(selection).unwrap();
/// assert_eq!(config, RpcModuleSelection::Selection(vec![RethRpcModule::Eth, RethRpcModule::Admin]));
/// ```
pub fn try_from_selection<I, T>(selection: I) -> Result<Self, T::Error>
where
I: IntoIterator<Item = T>,
T: TryInto<RethRpcModule>,
{
let selection =
selection.into_iter().map(TryInto::try_into).collect::<Result<Vec<_>, _>>()?;
Ok(RpcModuleSelection::Selection(selection))
let mut unique = HashSet::new();
let mut s = Vec::new();
for item in selection.into_iter() {
let item = item.try_into()?;
if unique.insert(item) {
s.push(item);
}
}
Ok(RpcModuleSelection::Selection(s))
}
/// Returns true if no selection is configured
@ -1834,6 +1854,19 @@ mod tests {
assert_eq!(selection, RpcModuleSelection::All);
}
#[test]
fn parse_rpc_unique_module_selection() {
let selection = "eth,admin,eth,net".parse::<RpcModuleSelection>().unwrap();
assert_eq!(
selection,
RpcModuleSelection::Selection(vec![
RethRpcModule::Eth,
RethRpcModule::Admin,
RethRpcModule::Net,
])
);
}
#[test]
fn identical_selection() {
assert!(RpcModuleSelection::are_identical(