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

unify &Option<T> to Option<&T> (#11755)

Browse Source
This commit is contained in:
nk_ysg
2024-10-16 15:57:28 +08:00
committed by GitHub
parent d4be773f5f
commit 3f3a7ef023
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/cli/commands/src/db/get.rs
View File

@ -132,9 +132,8 @@ pub(crate) fn table_key<T: Table>(key: &str) -> Result<T::Key, eyre::Error> {
}
/// Get an instance of subkey for given dupsort table
fn table_subkey<T: DupSort>(subkey: &Option<String>) -> Result<T::SubKey, eyre::Error> {
serde_json::from_str::<T::SubKey>(&subkey.clone().unwrap_or_default())
.map_err(|e| eyre::eyre!(e))
fn table_subkey<T: DupSort>(subkey: Option<&str>) -> Result<T::SubKey, eyre::Error> {
serde_json::from_str::<T::SubKey>(subkey.unwrap_or_default()).map_err(|e| eyre::eyre!(e))
}
struct GetValueViewer<'a, N: NodeTypesWithDB> {
@ -175,7 +174,7 @@ impl<N: ProviderNodeTypes> TableViewer<()> for GetValueViewer<'_, N> {
let key = table_key::<T>(&self.key)?;
// process dupsort table
let subkey = table_subkey::<T>(&self.subkey)?;
let subkey = table_subkey::<T>(self.subkey.as_deref())?;
match self.tool.get_dup::<T>(key, subkey)? {
Some(content) => {

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

@ -676,8 +676,8 @@ impl RpcModuleConfigBuilder {
}
/// Get a reference to the eth namespace config, if any
pub const fn get_eth(&self) -> &Option<EthConfig> {
&self.eth
pub const fn get_eth(&self) -> Option<&EthConfig> {
self.eth.as_ref()
}
/// Get a mutable reference to the eth namespace config, if any