rebase conflicts resolved

Author: ZocoLini

dash-spv/benches/storage.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use dash_spv::{
-    storage::{DiskStorageManager, StorageManager},
+    storage::{BlockHeaderStorage, DiskStorageManager, StorageManager},
     Hash,
 };
 use dashcore::{block::Version, BlockHash, CompactTarget, Header};

dash-spv/src/lib.rs

@@ -31,7 +31,7 @@
 //!     // Create the required components
 //!     let network = PeerNetworkManager::new(&config).await?;
 //!     let storage = DiskStorageManager::new("./.tmp/example-storage").await?;
-//!     let wallet = Arc::new(RwLock::new(WalletManager::<ManagedWalletInfo>::new()));
+//!     let wallet = Arc::new(RwLock::new(WalletManager::<ManagedWalletInfo>::new(Network::Dash)));
 //!
 //!     // Create and start the client
 //!     let mut client = DashSpvClient::new(config.clone(), network, storage, wallet).await?;

dash-spv/src/storage/mod.rs

@@ -64,6 +64,7 @@ pub trait StorageManager:
     + MasternodeStateStorage
     + Send
     + Sync
+    + 'static
 {
     /// Deletes in-disk and in-memory data
     async fn clear(&mut self) -> StorageResult<()>;
@@ -238,7 +239,7 @@ impl StorageManager for DiskStorageManager {
     }
 
     /// Shutdown the storage manager.
-    pub async fn shutdown(&mut self) {
+    async fn shutdown(&mut self) {
         self.stop_worker();
 
         self.persist().await;

dash-spv/src/storage/segments.rs

@@ -593,34 +593,18 @@ mod tests {
             .await
             .expect("Failed to create new segment_cache");
 
-        cache.store_items(&items).await.expect("Failed to store items");
+        cache.store_items_at_height(&items, 10).await.expect("Failed to store items");
 
         cache.persist(tmp_dir.path()).await;
 
         let mut cache = SegmentCache::<FilterHeader>::load_or_new(tmp_dir.path())
             .await
             .expect("Failed to load new segment_cache");
 
-<<<<<<< HEAD
-        let recovered_items = cache.get_items(0..10).await.expect("Failed to load items");
-
-        assert_eq!(recovered_items, items);
-        assert_eq!(cache.segments.len(), 1);
-
-        cache.clear_all().await.expect("Failed to clean on-memory and on-disk data");
-        assert!(cache.segments.is_empty());
-
-        let segment = cache.get_segment(&0).await.expect("Failed to create a new segment");
-
-        assert!(segment.first_valid_offset().is_none());
-        assert!(segment.last_valid_offset().is_none());
-        assert_eq!(segment.state, SegmentState::Dirty);
-=======
         assert_eq!(
             cache.get_items(10..20).await.expect("Failed to get items from segment cache"),
             items
         );
->>>>>>> f40a2bd9 (storage manager trait implemented)
     }
 
     #[tokio::test]

dash-spv/src/sync/headers/manager.rs

@@ -49,6 +49,7 @@ pub struct HeaderSyncManager<S: StorageManager, N: NetworkManager> {
     config: ClientConfig,
     tip_manager: ChainTipManager,
     checkpoint_manager: CheckpointManager,
+    reorg_config: ReorgConfig,
     chain_state: Arc<RwLock<ChainState>>,
     // WalletState removed - wallet functionality is now handled externally
     headers2_state: Headers2StateManager,
@@ -80,6 +81,7 @@ impl<S: StorageManager, N: NetworkManager> HeaderSyncManager<S, N> {
             config: config.clone(),
             tip_manager: ChainTipManager::new(reorg_config.max_forks),
             checkpoint_manager,
+            reorg_config,
             chain_state,
             // WalletState removed
             headers2_state: Headers2StateManager::new(),
@@ -212,7 +214,6 @@ impl<S: StorageManager, N: NetworkManager> HeaderSyncManager<S, N> {
 
         // Step 3: Process the Entire Validated Batch
 
-<<<<<<< HEAD
         // Checkpoint Validation: Perform in-memory security check against checkpoints
         for (index, cached_header) in cached_headers.iter().enumerate() {
             let prospective_height = tip_height + (index as u32) + 1;
@@ -229,8 +230,6 @@ impl<S: StorageManager, N: NetworkManager> HeaderSyncManager<S, N> {
             }
         }
 
-=======
->>>>>>> 7acccc0b (removed two methos that where invovled in the same process)
         storage
             .store_headers(headers)
             .await

dash-spv/tests/edge_case_filter_sync_test.rs

@@ -16,7 +16,7 @@ use dash_spv::{
     client::ClientConfig,
     error::NetworkResult,
     network::NetworkManager,
-    storage::{DiskStorageManager, StorageManager},
+    storage::{BlockHeaderStorage, DiskStorageManager, FilterHeaderStorage},
     sync::filters::FilterSyncManager,
 };
 use dashcore::{

dash-spv/tests/filter_header_verification_test.rs

@@ -19,7 +19,7 @@ use dash_spv::{
     client::ClientConfig,
     error::{NetworkError, NetworkResult, SyncError},
     network::NetworkManager,
-    storage::{DiskStorageManager, StorageManager},
+    storage::{BlockHeaderStorage, DiskStorageManager, FilterHeaderStorage},
     sync::filters::FilterSyncManager,
     types::PeerInfo,
 };

dash-spv/tests/rollback_test.rs

@@ -5,7 +5,7 @@
 
 #![cfg(feature = "skip_mock_implementation_incomplete")]
 
-use dash_spv::storage::{DiskStorageManager, StorageManager};
+use dash_spv::storage::{BlockHeaderStorage, DiskStorageManager, FilterHeaderStorage};
 use dashcore::{
     block::{Header as BlockHeader, Version},
     pow::CompactTarget,

dash-spv/tests/storage_test.rs

@@ -1,14 +1,7 @@
 //! Integration tests for storage layer functionality.
 
-<<<<<<< HEAD
-use dash_spv::{
-    storage::{DiskStorageManager, StorageManager},
-    StorageError,
-};
-=======
 use dash_spv::error::StorageError;
 use dash_spv::storage::{BlockHeaderStorage, DiskStorageManager, StorageManager};
->>>>>>> f40a2bd9 (storage manager trait implemented)
 use dashcore::{block::Header as BlockHeader, block::Version};
 use dashcore_hashes::Hash;
 use tempfile::TempDir;