fix merge

p2p/cuprate-p2p/src/bin/test_init.rs

@@ -153,30 +153,24 @@ async fn main() {
 
     sleep(Duration::from_secs(15)).await;
 
-    loop {
-        let mut buffer = download_blocks(
-            net.pool.clone(),
-            net.sync_states_svc.clone(),
-            OurChainSvc,
-            BlockDownloaderConfig {
-                buffer_size: 50_000_000,
-                in_progress_queue_size: 30_000_000,
-                check_client_pool_interval: Duration::from_secs(10),
-                target_batch_size: 5_000_000,
-                initial_batch_size: 10,
-            },
-        );
-
-        while let Some(entry) = buffer.next().await {
-            tracing::info!(
-                "height: {}, amount{}",
-                entry.blocks[0].0.number().unwrap(),
-                entry.blocks.len()
-            )
-        }
-
-        panic!();
-
-        sleep(Duration::from_secs(2)).await;
+    let mut buffer = download_blocks(
+        net.pool.clone(),
+        net.sync_states_svc.clone(),
+        OurChainSvc,
+        BlockDownloaderConfig {
+            buffer_size: 50_000_000,
+            in_progress_queue_size: 30_000_000,
+            check_client_pool_interval: Duration::from_secs(10),
+            target_batch_size: 5_000_000,
+            initial_batch_size: 10,
+        },
+    );
+
+    while let Some(entry) = buffer.next().await {
+        tracing::info!(
+            "height: {}, amount{}",
+            entry.blocks[0].0.number().unwrap(),
+            entry.blocks.len()
+        )
     }
 }

p2p/cuprate-p2p/src/block_downloader.rs

@@ -3,9 +3,8 @@
 
 mod chain_tracker;
 
-use futures::FutureExt;
 use std::cmp::{max, min, Ordering, Reverse};
-use std::collections::{BTreeMap, BinaryHeap, HashSet, VecDeque};
+use std::collections::{BTreeMap, BinaryHeap, HashSet};
 use std::sync::Arc;
 use std::time::Duration;
 

p2p/cuprate-p2p/src/lib.rs

@@ -20,6 +20,7 @@ use monero_p2p::{
     CoreSyncSvc, NetworkZone, PeerRequestHandler,
 };
 
+pub mod block_downloader;
 mod broadcast;
 mod client_pool;
 pub mod config;