computer: convert stores to vecs part 1

crates/brk_computer/src/all.rs

@@ -5,22 +5,11 @@ use brk_exit::Exit;
 use brk_fetcher::Fetcher;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, Computation, Format};
-
-pub mod blocks;
-pub mod cointime;
-pub mod constants;
-pub mod fetched;
-pub mod grouped;
-pub mod indexes;
-pub mod market;
-pub mod mining;
-pub mod stateful;
-pub mod transactions;
-
-pub use indexes::Indexes;
 use log::info;
 
-use crate::stores::Stores;
+use crate::{blocks, cointime, constants, fetched, indexes, market, mining, transactions};
+
+use super::stateful;
 
 const VERSION: Version = Version::ONE;
 
@@ -130,7 +119,6 @@ impl Vecs {
         starting_indexes: brk_indexer::Indexes,
         fetcher: Option<&mut Fetcher>,
         exit: &Exit,
-        stores: &mut Stores,
     ) -> color_eyre::Result<()> {
         info!("Computing indexes...");
         let mut starting_indexes = self.indexes.compute(indexer, starting_indexes, exit)?;
@@ -188,7 +176,6 @@ impl Vecs {
             &self.market,
             &mut starting_indexes,
             exit,
-            stores,
         )?;
 
         self.cointime.compute(

crates/brk_computer/src/blocks.rs

@@ -8,7 +8,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, EagerVec, Format};
 
-use crate::vecs::grouped::Source;
+use crate::grouped::Source;
 
 use super::{
     Indexes,

crates/brk_computer/src/cointime.rs

@@ -5,16 +5,13 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, Computation, Format, VecIterator};
 
-use crate::vecs::{
-    fetched,
-    grouped::{ComputedRatioVecsFromDateIndex, ComputedValueVecsFromHeight, Source},
-    stateful, transactions,
-};
-
 use super::{
-    Indexes,
-    grouped::{ComputedVecsFromHeight, VecBuilderOptions},
-    indexes,
+    Indexes, fetched,
+    grouped::{
+        ComputedRatioVecsFromDateIndex, ComputedValueVecsFromHeight, ComputedVecsFromHeight,
+        Source, VecBuilderOptions,
+    },
+    indexes, stateful, transactions,
 };
 
 const VERSION: Version = Version::ZERO;

crates/brk_computer/src/constants.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, AnyVec, Computation, Format};
 
-use crate::vecs::grouped::Source;
+use crate::grouped::Source;
 
 use super::{
     Indexes,

crates/brk_computer/src/fetched.rs

@@ -13,7 +13,7 @@ use brk_vec::{
     VecIterator,
 };
 
-use crate::vecs::grouped::Source;
+use crate::grouped::Source;
 
 use super::{
     Indexes,

crates/brk_computer/src/grouped/builder_computed.rs

@@ -7,7 +7,7 @@ use brk_vec::{
     ComputedVec, ComputedVecFrom2, Format, StoredIndex,
 };
 
-use crate::vecs::grouped::{EagerVecBuilder, VecBuilderOptions};
+use crate::grouped::{EagerVecBuilder, VecBuilderOptions};
 
 use super::ComputedType;
 

crates/brk_computer/src/grouped/from_dateindex.rs

@@ -10,7 +10,7 @@ use brk_vec::{
     AnyCollectableVec, AnyIterableVec, CloneableAnyIterableVec, Computation, EagerVec, Format,
 };
 
-use crate::vecs::{Indexes, grouped::ComputedVecBuilder, indexes};
+use crate::{Indexes, grouped::ComputedVecBuilder, indexes};
 
 use super::{ComputedType, EagerVecBuilder, Source, VecBuilderOptions};
 

crates/brk_computer/src/grouped/from_height.rs

@@ -10,7 +10,7 @@ use brk_vec::{
     AnyCollectableVec, AnyIterableVec, CloneableAnyIterableVec, Computation, EagerVec, Format,
 };
 
-use crate::vecs::{
+use crate::{
     Indexes,
     grouped::{ComputedVecBuilder, Source},
     indexes,

crates/brk_computer/src/grouped/from_height_strict.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, EagerVec, Format};
 
-use crate::vecs::{Indexes, indexes};
+use crate::{Indexes, indexes};
 
 use super::{ComputedType, EagerVecBuilder, VecBuilderOptions};
 

crates/brk_computer/src/grouped/from_txindex.rs

@@ -11,7 +11,7 @@ use brk_vec::{
     Format, StoredIndex, VecIterator,
 };
 
-use crate::vecs::{
+use crate::{
     Indexes, fetched,
     grouped::{ComputedVecBuilder, Source},
     indexes,

crates/brk_computer/src/grouped/ratio_from_dateindex.rs

@@ -8,10 +8,7 @@ use brk_vec::{
     StoredIndex, VecIterator,
 };
 
-use crate::{
-    utils::get_percentile,
-    vecs::{Indexes, fetched, grouped::source::Source, indexes},
-};
+use crate::{Indexes, fetched, grouped::source::Source, indexes, utils::get_percentile};
 
 use super::{ComputedVecsFromDateIndex, VecBuilderOptions};
 

crates/brk_computer/src/grouped/value_from_dateindex.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, CollectableVec, Computation, EagerVec, Format, StoredVec};
 
-use crate::vecs::{Indexes, fetched, grouped::ComputedVecsFromDateIndex, indexes};
+use crate::{Indexes, fetched, grouped::ComputedVecsFromDateIndex, indexes};
 
 use super::{Source, VecBuilderOptions};
 

crates/brk_computer/src/grouped/value_from_height.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, CollectableVec, Computation, EagerVec, Format, StoredVec};
 
-use crate::vecs::{Indexes, fetched, grouped::Source, indexes};
+use crate::{Indexes, fetched, grouped::Source, indexes};
 
 use super::{ComputedVecsFromHeight, VecBuilderOptions};
 

crates/brk_computer/src/grouped/value_from_txindex.rs

@@ -8,7 +8,7 @@ use brk_vec::{
     Format, LazyVecFrom1, StoredIndex, StoredVec,
 };
 
-use crate::vecs::{Indexes, fetched, grouped::Source, indexes};
+use crate::{Indexes, fetched, grouped::Source, indexes};
 
 use super::{ComputedVecsFromTxindex, VecBuilderOptions};
 

crates/brk_computer/src/grouped/value_height.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, CollectableVec, EagerVec, Format, StoredVec};
 
-use crate::vecs::{Indexes, fetched, grouped::Source, indexes};
+use crate::{Indexes, fetched, grouped::Source, indexes};
 
 #[derive(Clone)]
 pub struct ComputedHeightValueVecs {

crates/brk_computer/src/indexes.rs

@@ -15,8 +15,6 @@ use brk_vec::{
     ComputedVecFrom2, EagerVec, Format, StoredIndex, VecIterator,
 };
 
-use crate::vecs::indexes;
-
 const VERSION: Version = Version::ZERO;
 
 #[derive(Clone)]
@@ -1206,7 +1204,7 @@ pub struct Indexes {
 }
 
 impl Indexes {
-    pub fn update_from_height(&mut self, height: Height, indexes: &indexes::Vecs) {
+    pub fn update_from_height(&mut self, height: Height, indexes: &Vecs) {
         self.indexes.height = height;
         self.dateindex = DateIndex::try_from(
             indexes

crates/brk_computer/src/lib.rs

@@ -12,20 +12,28 @@ use brk_indexer::Indexer;
 use brk_vec::{Computation, Format};
 use log::info;
 
+mod all;
+mod blocks;
+mod cointime;
+mod constants;
+mod fetched;
+mod grouped;
+mod indexes;
+mod market;
+mod mining;
+mod stateful;
 mod states;
-mod stores;
+mod transactions;
 mod utils;
-mod vecs;
+
+use indexes::Indexes;
 
 use states::*;
-use stores::Stores;
-use vecs::Vecs;
 
 #[derive(Clone)]
 pub struct Computer {
     fetcher: Option<Fetcher>,
-    pub vecs: Vecs,
-    pub stores: Stores,
+    pub vecs: all::Vecs,
 }
 
 const VERSION: Version = Version::ONE;
@@ -40,7 +48,7 @@ impl Computer {
         format: Format,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
-            vecs: Vecs::import(
+            vecs: all::Vecs::import(
                 // TODO: Give self.path, join inside import
                 &outputs_dir.join("vecs/computed"),
                 VERSION + Version::ZERO,
@@ -49,12 +57,6 @@ impl Computer {
                 computation,
                 format,
             )?,
-            stores: Stores::import(
-                // TODO: Give self.path, join inside import
-                &outputs_dir.join("stores"),
-                VERSION + Version::ZERO,
-                &indexer.stores.keyspace,
-            )?,
             fetcher,
         })
     }
@@ -68,12 +70,7 @@ impl Computer {
         exit: &Exit,
     ) -> color_eyre::Result<()> {
         info!("Computing...");
-        self.vecs.compute(
-            indexer,
-            starting_indexes,
-            self.fetcher.as_mut(),
-            exit,
-            &mut self.stores,
-        )
+        self.vecs
+            .compute(indexer, starting_indexes, self.fetcher.as_mut(), exit)
     }
 }

crates/brk_computer/src/market.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, Computation, EagerVec, Format, StoredIndex, VecIterator};
 
-use crate::vecs::grouped::Source;
+use crate::grouped::Source;
 
 use super::{
     Indexes, fetched,

crates/brk_computer/src/mining.rs

@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, Computation, Format, VecIterator};
 
-use crate::vecs::grouped::Source;
+use crate::grouped::Source;
 
 use super::{
     Indexes,

crates/brk_computer/src/stateful/address_cohort.rs

@@ -8,16 +8,14 @@ use brk_vec::{
 };
 
 use crate::{
-    states::AddressCohortState,
-    vecs::{
-        Indexes, fetched,
-        grouped::{ComputedVecsFromHeight, Source, VecBuilderOptions},
-        indexes, market,
-        stateful::{
-            common,
-            r#trait::{CohortVecs, DynCohortVecs},
-        },
+    Indexes, fetched,
+    grouped::{ComputedVecsFromHeight, Source, VecBuilderOptions},
+    indexes, market,
+    stateful::{
+        common,
+        r#trait::{CohortVecs, DynCohortVecs},
     },
+    states::AddressCohortState,
 };
 
 const VERSION: Version = Version::ZERO;

crates/brk_computer/src/stateful/address_cohorts.rs

@@ -9,7 +9,7 @@ use brk_vec::{Computation, Format};
 use derive_deref::{Deref, DerefMut};
 use rayon::prelude::*;
 
-use crate::vecs::{
+use crate::{
     Indexes, fetched, indexes,
     stateful::{
         address_cohort,

crates/brk_computer/src/stateful/addresstype_to_addresscount.rs

@@ -2,7 +2,7 @@ use brk_core::{ByAddressType, Height};
 use brk_vec::VecIterator;
 use derive_deref::{Deref, DerefMut};
 
-use crate::vecs::stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount;
+use crate::stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount;
 
 #[derive(Debug, Default, Deref, DerefMut)]
 pub struct AddressTypeToAddressCount(ByAddressType<usize>);

crates/brk_computer/src/stateful/addresstype_to_height_to_addresscount.rs

@@ -3,7 +3,7 @@ use brk_exit::Exit;
 use brk_vec::EagerVec;
 use derive_deref::{Deref, DerefMut};
 
-use crate::vecs::stateful::addresstype_to_addresscount::AddressTypeToAddressCount;
+use crate::stateful::addresstype_to_addresscount::AddressTypeToAddressCount;
 
 #[derive(Debug, Clone, Deref, DerefMut)]
 pub struct AddressTypeToHeightToAddressCount(ByAddressType<EagerVec<Height, StoredUsize>>);

crates/brk_computer/src/stateful/addresstype_to_indexes_to_addresscount.rs

@@ -3,7 +3,7 @@ use brk_exit::Exit;
 use brk_vec::AnyCollectableVec;
 use derive_deref::{Deref, DerefMut};
 
-use crate::vecs::{
+use crate::{
     Indexes, grouped::ComputedVecsFromHeight, indexes,
     stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount,
 };

crates/brk_computer/src/stateful/common.rs

@@ -11,16 +11,13 @@ use brk_vec::{
 };
 
 use crate::{
-    states::CohortState,
-    vecs::{
-        Indexes, fetched,
-        grouped::{
-            ComputedHeightValueVecs, ComputedRatioVecsFromDateIndex,
-            ComputedValueVecsFromDateIndex, ComputedVecsFromDateIndex, ComputedVecsFromHeight,
-            Source, VecBuilderOptions,
-        },
-        indexes, market,
+    Indexes, fetched,
+    grouped::{
+        ComputedHeightValueVecs, ComputedRatioVecsFromDateIndex, ComputedValueVecsFromDateIndex,
+        ComputedVecsFromDateIndex, ComputedVecsFromHeight, Source, VecBuilderOptions,
     },
+    indexes, market,
+    states::CohortState,
 };
 
 const VERSION: Version = Version::ZERO;

crates/brk_computer/src/stateful/height_to_addresstype_to_vec.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use brk_core::Height;
 use derive_deref::{Deref, DerefMut};
 
-use crate::vecs::stateful::AddressTypeToVec;
+use crate::stateful::AddressTypeToVec;
 
 #[derive(Debug, Default, Deref, DerefMut)]
 pub struct HeightToAddressTypeToVec<T>(pub BTreeMap<Height, AddressTypeToVec<T>>);

crates/brk_computer/src/stateful/mod.rs

@@ -16,16 +16,13 @@ use rayon::prelude::*;
 
 use crate::{
     BlockState, SupplyState, Transacted,
-    stores::Stores,
-    vecs::{
-        grouped::{ComputedVecsFromHeight, Source},
-        market,
-        stateful::{
-            addresstype_to_addresscount::AddressTypeToAddressCount,
-            addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount,
-            addresstype_to_indexes_to_addresscount::AddressTypeToIndexesToAddressCount,
-            addresstype_to_typeindex_set::AddressTypeToTypeIndexSet, r#trait::DynCohortVecs,
-        },
+    grouped::{ComputedVecsFromHeight, Source},
+    market,
+    stateful::{
+        addresstype_to_addresscount::AddressTypeToAddressCount,
+        addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount,
+        addresstype_to_indexes_to_addresscount::AddressTypeToIndexesToAddressCount,
+        addresstype_to_typeindex_set::AddressTypeToTypeIndexSet, r#trait::DynCohortVecs,
     },
 };
 
@@ -461,7 +458,6 @@ impl Vecs {
         // Must take ownership as its indexes will be updated for this specific function
         starting_indexes: &mut Indexes,
         exit: &Exit,
-        stores: &mut Stores,
     ) -> color_eyre::Result<()> {
         let height_to_first_outputindex = &indexer.vecs.height_to_first_outputindex;
         let height_to_first_inputindex = &indexer.vecs.height_to_first_inputindex;

crates/brk_computer/src/stateful/trait.rs

@@ -3,7 +3,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, AnyIterableVec};
 
-use crate::vecs::{Indexes, fetched, indexes, market};
+use crate::{Indexes, fetched, indexes, market};
 
 pub trait DynCohortVecs: Send + Sync {
     fn starting_height(&self) -> Height;

crates/brk_computer/src/stateful/utxo_cohort.rs

@@ -6,13 +6,10 @@ use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, Format};
 
 use crate::{
-    UTXOCohortState,
-    vecs::{
-        Indexes, fetched, indexes, market,
-        stateful::{
-            common,
-            r#trait::{CohortVecs, DynCohortVecs},
-        },
+    Indexes, UTXOCohortState, fetched, indexes, market,
+    stateful::{
+        common,
+        r#trait::{CohortVecs, DynCohortVecs},
     },
 };
 

crates/brk_computer/src/stateful/utxo_cohorts.rs

@@ -11,8 +11,9 @@ use derive_deref::{Deref, DerefMut};
 use rayon::prelude::*;
 
 use crate::{
+    Indexes, fetched, indexes,
+    stateful::r#trait::DynCohortVecs,
     states::{BlockState, Transacted},
-    vecs::{Indexes, fetched, indexes, stateful::r#trait::DynCohortVecs},
 };
 
 use super::{r#trait::CohortVecs, utxo_cohort};

crates/brk_computer/src/stores.rs

@@ -9,7 +9,7 @@ use brk_store::{AnyStore, Store};
 use fjall::{PersistMode, TransactionalKeyspace};
 use log::info;
 
-use crate::vecs::stateful::{AddressTypeToTypeIndexTree, WithAddressDataSource};
+use crate::stateful::{AddressTypeToTypeIndexTree, WithAddressDataSource};
 
 const VERSION: Version = Version::ZERO;
 

crates/brk_computer/src/transactions.rs

@@ -11,17 +11,13 @@ use brk_vec::{
     ComputedVecFrom1, ComputedVecFrom2, ComputedVecFrom3, Format, StoredIndex, VecIterator,
 };
 
-use crate::vecs::grouped::Source;
-
-use super::{
-    Indexes, fetched,
-    grouped::{
-        ComputedValueVecsFromHeight, ComputedValueVecsFromTxindex, ComputedVecsFromHeight,
-        ComputedVecsFromTxindex, VecBuilderOptions,
-    },
-    indexes,
+use crate::grouped::{
+    ComputedValueVecsFromHeight, ComputedValueVecsFromTxindex, ComputedVecsFromHeight,
+    ComputedVecsFromTxindex, Source, VecBuilderOptions,
 };
 
+use super::{Indexes, fetched, indexes};
+
 const VERSION: Version = Version::ZERO;
 
 #[derive(Clone)]