Skip to content

Commit bc544a5

Browse files
committed
fixed clippy warnings
1 parent 4a26a7f commit bc544a5

File tree

6 files changed

+15
-14
lines changed

6 files changed

+15
-14
lines changed

dash-spv/src/chain/chainlock_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl ChainLockManager {
178178
if let Some(header) = storage
179179
.get_header(chain_lock.block_height)
180180
.await
181-
.map_err(|e| ValidationError::StorageError(e))?
181+
.map_err(ValidationError::StorageError)?
182182
{
183183
let header_hash = header.block_hash();
184184
if header_hash != chain_lock.block_hash {

dash-spv/src/client/lifecycle.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ impl<
191191
// Get initial header count from storage
192192
let (header_height, filter_height) = {
193193
let storage = self.storage.lock().await;
194-
let h_height =
195-
storage.get_tip_height().await.map_err(SpvError::Storage)?.unwrap_or(0);
194+
let h_height = storage.get_tip_height().await.unwrap_or(0);
196195
let f_height =
197196
storage.get_filter_tip_height().await.map_err(SpvError::Storage)?.unwrap_or(0);
198197
(h_height, f_height)

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,16 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
271271
let first_height = storage
272272
.get_start_height()
273273
.await
274-
.ok_or(SyncError::Storage(format!("Failed to get start height")))?;
274+
.ok_or(SyncError::Storage("Failed to get start height".to_string()))?;
275275
let checkpoint_header = storage
276276
.get_header(first_height)
277277
.await
278278
.map_err(|e| {
279279
SyncError::Storage(format!("Failed to get first header: {}", e))
280280
})?
281-
.ok_or(SyncError::Storage(format!("Storage didn't return first header")))?;
281+
.ok_or(SyncError::Storage(
282+
"Storage didn't return first header".to_string(),
283+
))?;
282284

283285
// Use the checkpoint hash from chain state
284286
let checkpoint_hash = checkpoint_header.block_hash();
@@ -500,12 +502,12 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
500502
let first_height = storage
501503
.get_start_height()
502504
.await
503-
.ok_or(SyncError::Storage(format!("Failed to get start height")))?;
505+
.ok_or(SyncError::Storage("Failed to get start height".to_string()))?;
504506
let checkpoint_header = storage
505507
.get_header(first_height)
506508
.await
507509
.map_err(|e| SyncError::Storage(format!("Failed to get first header: {}", e)))?
508-
.ok_or(SyncError::Storage(format!("Storage didn't return first header")))?;
510+
.ok_or(SyncError::Storage("Storage didn't return first header".to_string()))?;
509511

510512
let base_hash = match effective_tip_height {
511513
None => {
@@ -660,12 +662,12 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
660662
let first_height = storage
661663
.get_start_height()
662664
.await
663-
.ok_or(SyncError::Storage(format!("Failed to get start height")))?;
665+
.ok_or(SyncError::Storage("Failed to get start height".to_string()))?;
664666
let checkpoint_header = storage
665667
.get_header(first_height)
666668
.await
667669
.map_err(|e| SyncError::Storage(format!("Failed to get first header: {}", e)))?
668-
.ok_or(SyncError::Storage(format!("Storage didn't return first header")))?;
670+
.ok_or(SyncError::Storage("Storage didn't return first header".to_string()))?;
669671

670672
let recovery_base_hash = match current_tip_height {
671673
None => {

dash-spv/tests/edge_case_filter_sync_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ async fn test_filter_sync_at_tip_edge_case() {
144144
storage.store_filter_headers(&filter_headers).await.unwrap();
145145

146146
// Verify initial state
147-
let tip_height = storage.get_tip_height().await.unwrap().unwrap();
147+
let tip_height = storage.get_tip_height().await.unwrap();
148148
let filter_tip_height = storage.get_filter_tip_height().await.unwrap().unwrap();
149149
assert_eq!(tip_height, height - 1); // 0-indexed
150150
assert_eq!(filter_tip_height, height - 1); // 0-indexed

dash-spv/tests/filter_header_verification_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ async fn test_filter_header_verification_failure_reproduction() {
197197
let initial_headers = create_test_headers_range(1000, 5000); // Headers 1000-4999
198198
storage.store_headers(&initial_headers).await.expect("Failed to store initial headers");
199199

200-
let tip_height = storage.get_tip_height().await.unwrap().unwrap();
200+
let tip_height = storage.get_tip_height().await.unwrap();
201201
println!("Initial header chain stored: tip height = {}", tip_height);
202202
assert_eq!(tip_height, 4999);
203203

@@ -361,7 +361,7 @@ async fn test_overlapping_batches_from_different_peers() {
361361
let initial_headers = create_test_headers_range(1, 3000); // Headers 1-2999
362362
storage.store_headers(&initial_headers).await.expect("Failed to store initial headers");
363363

364-
let tip_height = storage.get_tip_height().await.unwrap().unwrap();
364+
let tip_height = storage.get_tip_height().await.unwrap();
365365
println!("Header chain stored: tip height = {}", tip_height);
366366
assert_eq!(tip_height, 2999);
367367

dash-spv/tests/rollback_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ async fn test_disk_storage_rollback() -> Result<(), Box<dyn std::error::Error>>
4242
storage.store_headers(&headers).await?;
4343

4444
// Verify we have 10 headers
45-
let tip_height = storage.get_tip_height().await?;
45+
let tip_height = storage.get_tip_height().await;
4646
assert_eq!(tip_height, Some(9));
4747

4848
// Load all headers to verify
@@ -54,7 +54,7 @@ async fn test_disk_storage_rollback() -> Result<(), Box<dyn std::error::Error>>
5454

5555
// TODO: Test assertions commented out because rollback_to_height is not implemented
5656
// Verify tip height is now 5
57-
let _ = storage.get_tip_height().await?;
57+
let _ = storage.get_tip_height().await;
5858
// assert_eq!(tip_height_after_rollback, Some(5));
5959

6060
// Verify we can only load headers up to height 5

0 commit comments

Comments
 (0)