Cuprate/cuprate
Cuprate/cuprate
1
0
Fork 0
mirror of https://github.com/Cuprate/cuprate.git synced 2025-02-03 11:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

read: fix signatures

Browse source
This commit is contained in:
hinto.janai 2024-04-23 14:49:27 -04:00
parent 64304dc84c
commit 4dbf7dafa9
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
database/src/service/read.rs
View file

@ -253,7 +253,7 @@ fn block_extended_header(env: &ConcreteEnv, block_height: BlockHeight) -> Respon
/// [`ReadRequest::BlockHash`]. /// [`ReadRequest::BlockHash`].
#[inline] #[inline]
fn block_hash(env: &Arc<ConcreteEnv>, block_height: BlockHeight) -> ResponseResult { fn block_hash(env: &ConcreteEnv, block_height: BlockHeight) -> ResponseResult {
let env_inner = env.env_inner(); let env_inner = env.env_inner();
let tx_ro = env_inner.tx_ro()?; let tx_ro = env_inner.tx_ro()?;
let table_block_infos = env_inner.open_db_ro::<BlockInfos>(&tx_ro)?; let table_block_infos = env_inner.open_db_ro::<BlockInfos>(&tx_ro)?;
@ -266,34 +266,21 @@ fn block_hash(env: &Arc<ConcreteEnv>, block_height: BlockHeight) -> ResponseResu
/// [`ReadRequest::BlockExtendedHeaderInRange`]. /// [`ReadRequest::BlockExtendedHeaderInRange`].
#[inline] #[inline]
fn block_extended_header_in_range( fn block_extended_header_in_range(
env: &Arc<ConcreteEnv>, env: &ConcreteEnv,
range: std::ops::Range<BlockHeight>, range: std::ops::Range<BlockHeight>,
) -> ResponseResult { ) -> ResponseResult {
let env_inner = env.env_inner(); let env_inner = env.env_inner();
// This iterator will early return as `Err` if there's even 1 error. // This iterator will early return as `Err` if there's even 1 error.
let vec = { let vec = {
cfg_if! { range
if #[cfg(all(feature = "redb", not(feature = "heed")))] { .into_par_iter()
.map(|block_height| {
let tx_ro = env_inner.tx_ro()?;
let tables = env_inner.open_tables(&tx_ro)?; let tables = env_inner.open_tables(&tx_ro)?;
let (env_inner, tx_ro, tables) = open_tables!(env); get_block_extended_header_from_height(&block_height, &tables)
range })
.into_par_iter() .collect::<Result<Vec<ExtendedBlockHeader>, RuntimeError>>()?
.map(|block_height| {
get_block_extended_header_from_height(&block_height, &tables)
})
.collect::<Result<Vec<ExtendedBlockHeader>, RuntimeError>>()?
} else {
range
.into_par_iter()
.map(|block_height| {
let tx_ro = env_inner.tx_ro()?;
let tables = env_inner.open_tables(&tx_ro)?;
get_block_extended_header_from_height(&block_height, &tables)
})
.collect::<Result<Vec<ExtendedBlockHeader>, RuntimeError>>()?
}
}
}; };
Ok(Response::BlockExtendedHeaderInRange(vec)) Ok(Response::BlockExtendedHeaderInRange(vec))
@ -301,20 +288,20 @@ fn block_extended_header_in_range(
/// [`ReadRequest::ChainHeight`]. /// [`ReadRequest::ChainHeight`].
#[inline] #[inline]
fn chain_height(env: &Arc<ConcreteEnv>) -> ResponseResult { fn chain_height(env: &ConcreteEnv) -> ResponseResult {
todo!() todo!()
} }
/// [`ReadRequest::GeneratedCoins`]. /// [`ReadRequest::GeneratedCoins`].
#[inline] #[inline]
fn generated_coins(env: &Arc<ConcreteEnv>) -> ResponseResult { fn generated_coins(env: &ConcreteEnv) -> ResponseResult {
todo!() todo!()
} }
/// [`ReadRequest::Outputs`]. /// [`ReadRequest::Outputs`].
#[inline] #[inline]
#[allow(clippy::needless_pass_by_value)] // TODO: remove me #[allow(clippy::needless_pass_by_value)] // TODO: remove me
fn outputs(env: &Arc<ConcreteEnv>, map: HashMap<Amount, HashSet<AmountIndex>>) -> ResponseResult { fn outputs(env: &ConcreteEnv, map: HashMap<Amount, HashSet<AmountIndex>>) -> ResponseResult {
todo!() todo!()
} }
@ -322,13 +309,13 @@ fn outputs(env: &Arc<ConcreteEnv>, map: HashMap<Amount, HashSet<AmountIndex>>) -
/// TODO /// TODO
#[inline] #[inline]
#[allow(clippy::needless_pass_by_value)] // TODO: remove me #[allow(clippy::needless_pass_by_value)] // TODO: remove me
fn number_outputs_with_amount(env: &Arc<ConcreteEnv>, vec: Vec<Amount>) -> ResponseResult { fn number_outputs_with_amount(env: &ConcreteEnv, vec: Vec<Amount>) -> ResponseResult {
todo!() todo!()
} }
/// [`ReadRequest::CheckKIsNotSpent`]. /// [`ReadRequest::CheckKIsNotSpent`].
#[inline] #[inline]
#[allow(clippy::needless_pass_by_value)] // TODO: remove me #[allow(clippy::needless_pass_by_value)] // TODO: remove me
fn check_k_is_not_spent(env: &Arc<ConcreteEnv>, set: HashSet<KeyImage>) -> ResponseResult { fn check_k_is_not_spent(env: &ConcreteEnv, set: HashSet<KeyImage>) -> ResponseResult {
todo!() todo!()
} }