Refactor database-related structs and modules

consensus/src/consensus/mod.rs

@@ -34,10 +34,9 @@ use crate::{
         ProcessingCounters,
     },
     processes::{
-        block_at_depth::BlockDepthManager, coinbase::CoinbaseManager, dagtraversalmanager::DagTraversalManager,
-        difficulty::DifficultyManager, ghostdag::protocol::GhostdagManager, mass::MassCalculator, parents_builder::ParentsManager,
-        pastmediantime::PastMedianTimeManager, pruning::PruningManager, reachability::inquirer as reachability,
-        transaction_validator::TransactionValidator,
+        block_depth::BlockDepthManager, coinbase::CoinbaseManager, difficulty::DifficultyManager, ghostdag::protocol::GhostdagManager,
+        mass::MassCalculator, parents_builder::ParentsManager, past_median_time::PastMedianTimeManager, pruning::PruningManager,
+        reachability::inquirer as reachability, transaction_validator::TransactionValidator, traversal_manager::DagTraversalManager,
     },
 };
 use consensus_core::block::Block;

consensus/src/consensus/test_consensus.rs

@@ -32,7 +32,7 @@ use crate::{
     },
     params::Params,
     pipeline::{body_processor::BlockBodyProcessor, ProcessingCounters},
-    processes::{dagtraversalmanager::DagTraversalManager, pastmediantime::PastMedianTimeManager},
+    processes::{past_median_time::PastMedianTimeManager, traversal_manager::DagTraversalManager},
     test_helpers::header_from_precomputed_hash,
 };
 

consensus/src/errors.rs

@@ -13,13 +13,13 @@ use itertools::Itertools;
 use thiserror::Error;
 
 #[derive(Clone, Debug)]
-
 pub struct VecDisplay<T: Display>(pub Vec<T>);
 impl<T: Display> Display for VecDisplay<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "[{}]", self.0.iter().map(|item| item.to_string()).join(", "))
     }
 }
+
 #[derive(Clone, Debug)]
 pub struct TwoDimVecDisplay<T: Display + Clone>(pub Vec<Vec<T>>);
 impl<T: Display + Clone> Display for TwoDimVecDisplay<T> {

consensus/src/model/stores/acceptance_data.rs

@@ -1,4 +1,8 @@
-use super::{caching::CachedDbAccess, errors::StoreError, DB};
+use super::{
+    database::prelude::{BatchDbWriter, CachedDbAccess, DirectDbWriter},
+    errors::StoreError,
+    DB,
+};
 use hashes::Hash;
 use rocksdb::WriteBatch;
 use serde::{Deserialize, Serialize};
@@ -39,7 +43,7 @@ impl DbAcceptanceDataStore {
         if self.cached_access.has(hash)? {
             return Err(StoreError::KeyAlreadyExists(hash.to_string()));
         }
-        self.cached_access.write_batch(batch, hash, &acceptance_data)?;
+        self.cached_access.write(BatchDbWriter::new(batch), hash, &acceptance_data)?;
         Ok(())
     }
 }
@@ -55,7 +59,7 @@ impl AcceptanceDataStore for DbAcceptanceDataStore {
         if self.cached_access.has(hash)? {
             return Err(StoreError::KeyAlreadyExists(hash.to_string()));
         }
-        self.cached_access.write(hash, &acceptance_data)?;
+        self.cached_access.write(DirectDbWriter::new(&self.raw_db), hash, &acceptance_data)?;
         Ok(())
     }
 }

consensus/src/model/stores/block_transactions.rs

@@ -1,6 +1,10 @@
 use std::sync::Arc;
 
-use super::{caching::CachedDbAccess, errors::StoreError, DB};
+use super::{
+    database::prelude::{BatchDbWriter, CachedDbAccess, DirectDbWriter},
+    errors::StoreError,
+    DB,
+};
 use consensus_core::tx::Transaction;
 use hashes::Hash;
 use rocksdb::WriteBatch;
@@ -37,7 +41,7 @@ impl DbBlockTransactionsStore {
         if self.cached_access.has(hash)? {
             return Err(StoreError::KeyAlreadyExists(hash.to_string()));
         }
-        self.cached_access.write_batch(batch, hash, &transactions)?;
+        self.cached_access.write(BatchDbWriter::new(batch), hash, &transactions)?;
         Ok(())
     }
 }
@@ -53,7 +57,7 @@ impl BlockTransactionsStore for DbBlockTransactionsStore {
         if self.cached_access.has(hash)? {
             return Err(StoreError::KeyAlreadyExists(hash.to_string()));
         }
-        self.cached_access.write(hash, &transactions)?;
+        self.cached_access.write(DirectDbWriter::new(&self.raw_db), hash, &transactions)?;
         Ok(())
     }
 }

consensus/src/model/stores/block_window_cache.rs

@@ -1,10 +1,7 @@
-use std::{cmp::Reverse, collections::BinaryHeap, sync::Arc};
-
+use super::database::prelude::Cache;
 use crate::processes::ghostdag::ordering::SortableBlock;
-
 use hashes::Hash;
-
-use super::caching::Cache;
+use std::{cmp::Reverse, collections::BinaryHeap, sync::Arc};
 
 pub type BlockWindowHeap = BinaryHeap<Reverse<SortableBlock>>;