SyntheticBird/cuprate-hinto-janai
1
0
Fork 0
mirror of https://github.com/hinto-janai/cuprate.git synced 2025-01-22 02:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clippy + fmt

Browse source
This commit is contained in:
Boog900 2024-09-07 02:07:23 +01:00
parent ba5c5ac45d
commit f92375f6a6
No known key found for this signature in database
GPG key ID: 42AB1287CB0041C2
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/blockchain/src/service/read.rs
View file

@ -14,13 +14,14 @@ use rayon::{
use thread_local::ThreadLocal; use thread_local::ThreadLocal;
use cuprate_database::{ConcreteEnv, DatabaseRo, Env, EnvInner, RuntimeError}; use cuprate_database::{ConcreteEnv, DatabaseRo, Env, EnvInner, RuntimeError};
use cuprate_database_service::{DatabaseReadService, init_thread_pool, ReaderThreads}; use cuprate_database_service::{init_thread_pool, DatabaseReadService, ReaderThreads};
use cuprate_helper::map::combine_low_high_bits_to_u128; use cuprate_helper::map::combine_low_high_bits_to_u128;
use cuprate_types::{ use cuprate_types::{
blockchain::{BlockchainReadRequest, BlockchainResponse}, blockchain::{BlockchainReadRequest, BlockchainResponse},
Chain, ChainId, ExtendedBlockHeader, OutputOnChain, Chain, ChainId, ExtendedBlockHeader, OutputOnChain,
}; };
use crate::ops::alt_block::get_alt_block;
use crate::{ use crate::{
ops::{ ops::{
alt_block::{ alt_block::{
@ -43,7 +44,6 @@ use crate::{
AltBlockHeight, Amount, AmountIndex, BlockHash, BlockHeight, KeyImage, PreRctOutputId, AltBlockHeight, Amount, AmountIndex, BlockHash, BlockHeight, KeyImage, PreRctOutputId,
}, },
}; };
use crate::ops::alt_block::get_alt_block;
//---------------------------------------------------------------------------------------------------- init_read_service //---------------------------------------------------------------------------------------------------- init_read_service
/// Initialize the [`BlockchainReadHandle`] thread-pool backed by [`rayon`]. /// Initialize the [`BlockchainReadHandle`] thread-pool backed by [`rayon`].

16
storage/blockchain/src/types.rs
View file

@ -44,12 +44,12 @@
use std::num::NonZero; use std::num::NonZero;
use bytemuck::{Pod, Zeroable}; use bytemuck::{Pod, Zeroable};
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use cuprate_database::{Key, StorableVec}; use cuprate_database::{Key, StorableVec};
use cuprate_types::{Chain, ChainId}; use cuprate_types::{Chain, ChainId};
//---------------------------------------------------------------------------------------------------- Aliases //---------------------------------------------------------------------------------------------------- Aliases
// These type aliases exist as many Monero-related types are the exact same. // These type aliases exist as many Monero-related types are the exact same.
// For clarity, they're given type aliases as to not confuse them. // For clarity, they're given type aliases as to not confuse them.
@ -334,17 +334,15 @@ pub struct RawChain(u64);
impl From<Chain> for RawChain { impl From<Chain> for RawChain {
fn from(value: Chain) -> Self { fn from(value: Chain) -> Self {
match value { match value {
Chain::Main => RawChain(0), Chain::Main => Self(0),
Chain::Alt(chain_id) => RawChain(chain_id.0.get()), Chain::Alt(chain_id) => Self(chain_id.0.get()),
} }
} }
} }
impl From<RawChain> for Chain { impl From<RawChain> for Chain {
fn from(value: RawChain) -> Self { fn from(value: RawChain) -> Self {
NonZero::new(value.0) NonZero::new(value.0).map_or(Self::Main, |id| Self::Alt(ChainId(id)))
.map(|id| Chain::Alt(ChainId(id)))
.unwrap_or(Chain::Main)
} }
} }
@ -352,7 +350,7 @@ impl From<RawChainId> for RawChain {
fn from(value: RawChainId) -> Self { fn from(value: RawChainId) -> Self {
assert_ne!(value.0, 0); assert_ne!(value.0, 0);
RawChain(value.0) Self(value.0)
} }
} }
@ -363,13 +361,13 @@ pub struct RawChainId(u64);
impl From<ChainId> for RawChainId { impl From<ChainId> for RawChainId {
fn from(value: ChainId) -> Self { fn from(value: ChainId) -> Self {
RawChainId(value.0.get()) Self(value.0.get())
} }
} }
impl From<RawChainId> for ChainId { impl From<RawChainId> for ChainId {
fn from(value: RawChainId) -> Self { fn from(value: RawChainId) -> Self {
ChainId(NonZero::new(value.0).expect("RawChainId mut not have a value of `0`")) Self(NonZero::new(value.0).expect("RawChainId mut not have a value of `0`"))
} }
} }