Skip to content

Commit c76ddbb

Browse files
authored
chore: Some restructuring in dash-spv::sync (#236)
1 parent 1035c62 commit c76ddbb

23 files changed

+259
-279
lines changed

dash-spv/src/client/core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::mempool_filter::MempoolFilter;
2020
use crate::network::NetworkManager;
2121
use crate::storage::StorageManager;
2222
use crate::sync::filters::FilterNotificationSender;
23-
use crate::sync::sequential::SyncManager;
23+
use crate::sync::SyncManager;
2424
use crate::types::{ChainState, DetailedSyncProgress, MempoolState, SpvEvent, SpvStats};
2525
use crate::validation::ValidationManager;
2626
use key_wallet_manager::wallet_interface::WalletInterface;

dash-spv/src/client/filter_sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::error::{Result, SpvError};
44
use crate::network::NetworkManager;
55
use crate::storage::StorageManager;
6-
use crate::sync::sequential::SyncManager;
6+
use crate::sync::SyncManager;
77
use crate::types::FilterMatch;
88
use crate::types::SpvStats;
99
use key_wallet_manager::wallet_interface::WalletInterface;

dash-spv/src/client/lifecycle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::error::{Result, SpvError};
1717
use crate::mempool_filter::MempoolFilter;
1818
use crate::network::NetworkManager;
1919
use crate::storage::StorageManager;
20-
use crate::sync::sequential::SyncManager;
20+
use crate::sync::SyncManager;
2121
use crate::types::{ChainState, MempoolState, SpvStats};
2222
use crate::validation::ValidationManager;
2323
use dashcore::network::constants::NetworkExt;

dash-spv/src/client/message_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::error::{Result, SpvError};
55
use crate::mempool_filter::MempoolFilter;
66
use crate::network::NetworkManager;
77
use crate::storage::StorageManager;
8-
use crate::sync::sequential::SyncManager;
8+
use crate::sync::SyncManager;
99
use crate::types::{MempoolState, SpvEvent, SpvStats};
1010
// Removed local ad-hoc compact filter construction in favor of always processing full blocks
1111
use key_wallet_manager::wallet_interface::WalletInterface;

dash-spv/src/client/message_handler_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mod tests {
1212
use crate::storage::memory::MemoryStorageManager;
1313
use crate::storage::StorageManager;
1414
use crate::sync::filters::FilterNotificationSender;
15-
use crate::sync::sequential::SyncManager;
15+
use crate::sync::SyncManager;
1616
use crate::types::{ChainState, MempoolState, SpvEvent, SpvStats};
1717
use crate::validation::ValidationManager;
1818
use crate::wallet::Wallet;

dash-spv/src/client/progress.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use crate::error::Result;
99
use crate::network::NetworkManager;
1010
use crate::storage::StorageManager;
11-
use crate::sync::sequential::phases::SyncPhase;
11+
use crate::sync::SyncPhase;
1212
use crate::types::{SpvStats, SyncProgress, SyncStage};
1313
use key_wallet_manager::wallet_interface::WalletInterface;
1414

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::client::ClientConfig;
1212
use crate::error::{SyncError, SyncResult};
1313
use crate::network::NetworkManager;
1414
use crate::storage::StorageManager;
15-
use crate::sync::headers2_state::Headers2StateManager;
15+
use crate::sync::headers2::Headers2StateManager;
1616
use crate::types::{CachedHeader, ChainState};
1717
use std::sync::Arc;
1818
use tokio::sync::RwLock;
@@ -611,10 +611,8 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
611611

612612
// If we failed due to missing previous header, and we're at genesis,
613613
// this might be a protocol issue where peer expects us to have genesis in compression state
614-
if matches!(
615-
e,
616-
crate::sync::headers2_state::ProcessError::DecompressionError(0, _)
617-
) && self.chain_state.read().await.tip_height() == 0
614+
if matches!(e, crate::sync::headers2::ProcessError::DecompressionError(0, _))
615+
&& self.chain_state.read().await.tip_height() == 0
618616
{
619617
tracing::warn!(
620618
"Headers2 decompression failed at genesis. Peer may be sending compressed headers that reference genesis. Consider falling back to regular headers."

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//! Header synchronization with fork detection and reorganization handling.
2+
3+
mod manager;
4+
5+
pub use manager::{HeaderSyncManager, ReorgConfig};

dash-spv/src/sync/headers2/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//! Headers2 state management for compressed header synchronization.
2+
3+
mod manager;
4+
5+
pub use manager::{Headers2StateManager, Headers2Stats, ProcessError};

0 commit comments

Comments
 (0)