Improve test_accept_not_a_better_block wait chain_service finished be…

…fore exit Signed-off-by: Eval EXEC <[email protected]>
eval-exec · Aug 2, 2024 · dc5dfb8 · dc5dfb8
1 parent b31c07d
commit dc5dfb8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/sync/src/relayer/tests/compact_block_process.rs b/sync/src/relayer/tests/compact_block_process.rs
@@ -200,6 +200,21 @@ fn test_accept_not_a_better_block() {
         peer_index,
     );
     assert_eq!(compact_block_process.execute(), Status::ok());
+
+    // wait chain_service processed the compact block, check block hash in snapshot
+    {
+        let now = std::time::Instant::now();
+        loop {
+            std::thread::sleep(std::time::Duration::from_millis(100));
+            if now.elapsed().as_secs() > 5 {
+                panic!("wait chain_service processed the compact block timeout");
+            }
+            let snapshot = relayer.shared.shared().snapshot();
+            if snapshot.get_block(&uncle_block.header().hash()).is_some() {
+                break;
+            }
+        }
+    }
 }
 
 #[test]

diff --git a/sync/src/tests/sync_shared.rs b/sync/src/tests/sync_shared.rs
@@ -355,7 +355,7 @@ fn test_sync_relay_collaboration() {
     {
         let now = std::time::Instant::now();
         while sync_shared.active_chain().tip_number() != new_block.number() {
-            std::thread::sleep(std::time::Duration::from_millis(10));
+            std::thread::sleep(std::time::Duration::from_millis(100));
             if now.elapsed().as_secs() > 10 {
                 panic!("wait 10 seconds, but not sync yet.");
             }
@@ -442,7 +442,7 @@ fn test_sync_relay_collaboration2() {
     {
         let now = std::time::Instant::now();
         while sync_shared.active_chain().tip_number() != new_block.number() {
-            std::thread::sleep(std::time::Duration::from_millis(10));
+            std::thread::sleep(std::time::Duration::from_millis(100));
             if now.elapsed().as_secs() > 10 {
                 panic!("wait 10 seconds, but not sync yet.");
             }
@@ -465,7 +465,7 @@ fn test_sync_relay_collaboration2() {
     {
         let now = std::time::Instant::now();
         while sync_shared.active_chain().tip_number() != new_block.number() {
-            std::thread::sleep(std::time::Duration::from_millis(10));
+            std::thread::sleep(std::time::Duration::from_millis(100));
             if now.elapsed().as_secs() > 10 {
                 panic!("wait 10 seconds, but not sync yet.");
             }

diff --git a/sync/src/tests/synchronizer/functions.rs b/sync/src/tests/synchronizer/functions.rs
@@ -51,6 +51,10 @@ fn start_chain(consensus: Option<Consensus>) -> (ChainController, Shared, Synchr
 
     let chain_controller = start_chain_services(pack.take_chain_services_builder());
 
+    while chain_controller.is_verifying_unverified_blocks_on_startup() {
+        std::thread::sleep(std::time::Duration::from_millis(10));
+    }
+
     let sync_shared = Arc::new(SyncShared::new(
         shared.clone(),
         Default::default(),