chore: resolve feature flag issue

Author: obycode

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

@@ -44,12 +44,11 @@ use crate::chainstate::nakamoto::coordinator::load_nakamoto_reward_set;
 use crate::chainstate::nakamoto::miner::NakamotoBlockBuilder;
 use crate::chainstate::nakamoto::signer_set::NakamotoSigners;
 use crate::chainstate::nakamoto::test_signers::TestSigners;
+use crate::chainstate::nakamoto::test_stall::*;
 use crate::chainstate::nakamoto::tests::get_account;
 use crate::chainstate::nakamoto::tests::node::TestStacker;
 use crate::chainstate::nakamoto::{
-    disable_process_block_stall, enable_process_block_stall, NakamotoBlock,
-    NakamotoBlockObtainMethod, NakamotoChainState, NakamotoStagingBlocksConnRef,
-    TEST_PROCESS_BLOCK_STALL,
+    NakamotoBlock, NakamotoBlockObtainMethod, NakamotoChainState, NakamotoStagingBlocksConnRef,
 };
 use crate::chainstate::stacks::address::PoxAddress;
 use crate::chainstate::stacks::boot::pox_4_tests::{get_stacking_minimum, get_tip};

stackslib/src/chainstate/nakamoto/mod.rs

@@ -270,27 +270,29 @@ lazy_static! {
     ];
 }
 
-// Cause an artifical stall in block-processing, for testing.
-#[cfg(any(test, feature = "testing"))]
-pub static TEST_PROCESS_BLOCK_STALL: std::sync::Mutex<Option<bool>> = std::sync::Mutex::new(None);
-
-fn stall_block_processing() {
-    if *TEST_PROCESS_BLOCK_STALL.lock().unwrap() == Some(true) {
-        // Do an extra check just so we don't log EVERY time.
-        warn!("Block processing is stalled due to testing directive.");
-        while *TEST_PROCESS_BLOCK_STALL.lock().unwrap() == Some(true) {
-            std::thread::sleep(std::time::Duration::from_millis(10));
+#[cfg(test)]
+mod test_stall {
+    pub static TEST_PROCESS_BLOCK_STALL: std::sync::Mutex<Option<bool>> =
+        std::sync::Mutex::new(None);
+
+    pub fn stall_block_processing() {
+        if *TEST_PROCESS_BLOCK_STALL.lock().unwrap() == Some(true) {
+            // Do an extra check just so we don't log EVERY time.
+            warn!("Block processing is stalled due to testing directive.");
+            while *TEST_PROCESS_BLOCK_STALL.lock().unwrap() == Some(true) {
+                std::thread::sleep(std::time::Duration::from_millis(10));
+            }
+            info!("Block processing is no longer stalled due to testing directive.");
         }
-        info!("Block processing is no longer stalled due to testing directive.");
     }
-}
 
-pub fn enable_process_block_stall() {
-    TEST_PROCESS_BLOCK_STALL.lock().unwrap().replace(true);
-}
+    pub fn enable_process_block_stall() {
+        TEST_PROCESS_BLOCK_STALL.lock().unwrap().replace(true);
+    }
 
-pub fn disable_process_block_stall() {
-    TEST_PROCESS_BLOCK_STALL.lock().unwrap().replace(false);
+    pub fn disable_process_block_stall() {
+        TEST_PROCESS_BLOCK_STALL.lock().unwrap().replace(false);
+    }
 }
 
 /// Trait for common MARF getters between StacksDBConn and StacksDBTx
@@ -1745,8 +1747,8 @@ impl NakamotoChainState {
         canonical_sortition_tip: &SortitionId,
         dispatcher_opt: Option<&'a T>,
     ) -> Result<Option<StacksEpochReceipt>, ChainstateError> {
-        #[cfg(any(test, feature = "testing"))]
-        stall_block_processing();
+        #[cfg(test)]
+        test_stall::stall_block_processing();
 
         let nakamoto_blocks_db = stacks_chain_state.nakamoto_blocks_db();
         let Some((next_ready_block, block_size)) =