mirror of
https://github.com/bitcoinresearchkit/brk.git
synced 2026-07-11 02:58:14 -07:00
global: fmt
This commit is contained in:
@@ -57,7 +57,6 @@ impl Vecs {
|
||||
})
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub(crate) fn compute(
|
||||
&mut self,
|
||||
starting_indexes: &Indexes,
|
||||
@@ -67,8 +66,7 @@ impl Vecs {
|
||||
mining: &mining::Vecs,
|
||||
exit: &Exit,
|
||||
) -> Result<()> {
|
||||
self.base
|
||||
.compute(starting_indexes, pool, blocks, exit)?;
|
||||
self.base.compute(starting_indexes, pool, blocks, exit)?;
|
||||
|
||||
for (dom, (mined, total)) in self.dominance_rolling.as_mut_array().into_iter().zip(
|
||||
self.base
|
||||
@@ -86,11 +84,8 @@ impl Vecs {
|
||||
)?;
|
||||
}
|
||||
|
||||
self.rewards.compute(
|
||||
starting_indexes.height,
|
||||
prices,
|
||||
exit,
|
||||
|vec| {
|
||||
self.rewards
|
||||
.compute(starting_indexes.height, prices, exit, |vec| {
|
||||
Ok(vec.compute_transform2(
|
||||
starting_indexes.height,
|
||||
&self.base.blocks_mined.block,
|
||||
@@ -98,8 +93,7 @@ impl Vecs {
|
||||
|(h, mask, val, ..)| (h, MaskSats::apply(mask, val)),
|
||||
exit,
|
||||
)?)
|
||||
},
|
||||
)?;
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
use brk_error::Result;
|
||||
use brk_traversable::Traversable;
|
||||
use brk_types::{BasisPoints16, Height, Indexes, PoolSlug, StoredU32, StoredU64};
|
||||
use vecdb::{
|
||||
Database, Exit, ReadableVec, Rw, StorageMode, Version,
|
||||
};
|
||||
use vecdb::{Database, Exit, ReadableVec, Rw, StorageMode, Version};
|
||||
|
||||
use crate::{
|
||||
blocks, indexes,
|
||||
internal::{
|
||||
CachedWindowStarts, PerBlockCumulativeRolling, PercentPerBlock, RatioU64Bp16,
|
||||
},
|
||||
internal::{CachedWindowStarts, PerBlockCumulativeRolling, PercentPerBlock, RatioU64Bp16},
|
||||
};
|
||||
|
||||
#[derive(Traversable)]
|
||||
@@ -39,8 +35,7 @@ impl Vecs {
|
||||
cached_starts,
|
||||
)?;
|
||||
|
||||
let dominance =
|
||||
PercentPerBlock::forced_import(db, &suffix("dominance"), version, indexes)?;
|
||||
let dominance = PercentPerBlock::forced_import(db, &suffix("dominance"), version, indexes)?;
|
||||
|
||||
Ok(Self {
|
||||
slug,
|
||||
|
||||
@@ -4,9 +4,7 @@ use brk_error::Result;
|
||||
use brk_indexer::Indexer;
|
||||
use brk_store::AnyStore;
|
||||
use brk_traversable::Traversable;
|
||||
use brk_types::{
|
||||
Addr, AddrBytes, Height, Indexes, OutputType, PoolSlug, Pools, TxOutIndex, pools,
|
||||
};
|
||||
use brk_types::{Addr, AddrBytes, Height, Indexes, OutputType, PoolSlug, Pools, TxOutIndex, pools};
|
||||
use rayon::prelude::*;
|
||||
use vecdb::{
|
||||
AnyStoredVec, AnyVec, BytesVec, Database, Exit, ImportableVec, ReadableVec, Rw, StorageMode,
|
||||
@@ -18,7 +16,10 @@ pub mod minor;
|
||||
|
||||
use crate::{
|
||||
blocks, indexes,
|
||||
internal::{CachedWindowStarts, db_utils::{finalize_db, open_db}},
|
||||
internal::{
|
||||
CachedWindowStarts,
|
||||
db_utils::{finalize_db, open_db},
|
||||
},
|
||||
mining, prices,
|
||||
};
|
||||
|
||||
@@ -91,19 +92,12 @@ impl Vecs {
|
||||
self.compute_pool(indexer, indexes, starting_indexes, exit)?;
|
||||
|
||||
self.major.par_iter_mut().try_for_each(|(_, vecs)| {
|
||||
vecs.compute(
|
||||
starting_indexes,
|
||||
&self.pool,
|
||||
blocks,
|
||||
prices,
|
||||
mining,
|
||||
exit,
|
||||
)
|
||||
vecs.compute(starting_indexes, &self.pool, blocks, prices, mining, exit)
|
||||
})?;
|
||||
|
||||
self.minor.par_iter_mut().try_for_each(|(_, vecs)| {
|
||||
vecs.compute(starting_indexes, &self.pool, blocks, exit)
|
||||
})?;
|
||||
self.minor
|
||||
.par_iter_mut()
|
||||
.try_for_each(|(_, vecs)| vecs.compute(starting_indexes, &self.pool, blocks, exit))?;
|
||||
|
||||
let exit = exit.clone();
|
||||
self.db.run_bg(move |db| {
|
||||
@@ -137,10 +131,7 @@ impl Vecs {
|
||||
|
||||
let unknown = self.pools.get_unknown();
|
||||
|
||||
let min = starting_indexes
|
||||
.height
|
||||
.to_usize()
|
||||
.min(self.pool.len());
|
||||
let min = starting_indexes.height.to_usize().min(self.pool.len());
|
||||
|
||||
// Cursors avoid per-height PcoVec page decompression.
|
||||
// Heights are sequential, tx_index values derived from them are monotonically
|
||||
|
||||
Reference in New Issue
Block a user