test: finish deadlock test

Author: obycode

stackslib/src/chainstate/nakamoto/coordinator/tests.rs

@@ -2495,33 +2495,40 @@ fn process_next_nakamoto_block_deadlock() {
     info!("Creating peer");
 
     let mut peer = boot_plan.boot_into_nakamoto_peer(vec![], None);
+    let (chainstate, _) = &mut peer
+        .stacks_node
+        .as_mut()
+        .unwrap()
+        .chainstate
+        .reopen()
+        .unwrap();
 
     // Lock the sortdb
     info!("  -------------------------------   TRYING TO LOCK THE SORTDB");
     let mut sortition_db = peer.sortdb().reopen().unwrap();
     let sort_tx = sortition_db.tx_begin().unwrap();
+    info!("  -------------------------------   SORTDB LOCKED");
 
-    // Start another thread that opens the sortdb, waits 10s, then tries to
-    // lock the chainstate db. This should cause a deadlock if the block
-    // processing is not acquiring the locks in the correct order.
-    info!("  -------------------------------   SPAWNING BLOCKER THREAD");
-    let blocker_thread = std::thread::spawn(move || {
-        // Wait a bit, to ensure the tenure will have grabbed any locks it needs
-        std::thread::sleep(std::time::Duration::from_secs(10));
+    let miner_thread = std::thread::spawn(move || {
+        info!("  -------------------------------   MINING TENURE");
+        let (block, burn_height, ..) =
+            peer.single_block_tenure(&private_key, |_| {}, |_| {}, |_| true);
+        peer.try_process_block(&block).unwrap();
+        info!("  -------------------------------   TENURE MINED");
+    });
 
-        // Lock the chainstate db
-        info!("  -------------------------------   TRYING TO LOCK THE CHAINSTATE");
-        let chainstate = &mut peer.stacks_node.as_mut().unwrap().chainstate;
-        let (chainstate_tx, _) = chainstate.chainstate_tx_begin().unwrap();
+    // Wait a bit, to ensure the tenure will have grabbed any locks it needs
+    std::thread::sleep(std::time::Duration::from_secs(10));
 
-        info!("  -------------------------------   SORTDB AND CHAINSTATE LOCKED");
-        info!("  -------------------------------   BLOCKER THREAD FINISHED");
-    });
+    // Lock the chainstate db
+    info!("  -------------------------------   TRYING TO LOCK THE CHAINSTATE");
+    let chainstate_tx = chainstate.chainstate_tx_begin().unwrap();
 
-    info!("  -------------------------------   MINING TENURE");
-    let (block, burn_height, ..) = peer.single_block_tenure(&private_key, |_| {}, |_| {}, |_| true);
-    info!("  -------------------------------   TENURE MINED");
+    info!("  -------------------------------   SORTDB AND CHAINSTATE LOCKED");
+    drop(chainstate_tx);
+    drop(sort_tx);
+    info!("  -------------------------------   MAIN THREAD FINISHED");
 
-    // Wait for the blocker thread to finish
-    blocker_thread.join().unwrap();
+    // Wait for the blocker and miner threads to finish
+    miner_thread.join().unwrap();
 }