Merge pull request stacks-network#6968 from jacinta-stacks/fix/flakey-tenure-extend-tests

Fix flakiness in a bunch of tests

Author: jacinta-stacks

stacks-node/src/nakamoto_node/relayer.rs

@@ -1702,7 +1702,7 @@ impl RelayerThread {
 
     #[cfg(test)]
     fn fault_injection_skip_block_commit(&self) -> bool {
-        self.globals.counters.naka_skip_commit_op.get()
+        self.globals.counters.skip_commit_op.get()
     }
 
     #[cfg(not(test))]

stacks-node/src/neon_node.rs

@@ -2645,6 +2645,11 @@ impl BlockMinerThread {
         );
 
         // let's commit
+        #[cfg(test)]
+        if self.globals.counters.skip_commit_op.get() {
+            debug!("Relayer: fault injection: skip block commit");
+            return None;
+        }
         let op = self.make_block_commit(
             &mut burn_db,
             &mut chain_state,

stacks-node/src/run_loop/neon.rs

@@ -135,7 +135,7 @@ pub struct Counters {
     pub naka_miner_current_rejections_timeout_secs: RunLoopCounter,
 
     #[cfg(test)]
-    pub naka_skip_commit_op: TestFlag<bool>,
+    pub skip_commit_op: TestFlag<bool>,
 }
 
 impl Counters {

stacks-node/src/tests/nakamoto_integrations.rs

@@ -5402,7 +5402,7 @@ fn bad_commit_does_not_trigger_fork() {
         blocks_processed,
         naka_submitted_commits: commits_submitted,
         naka_mined_blocks: mined_blocks,
-        naka_skip_commit_op: test_skip_commit_op,
+        skip_commit_op: test_skip_commit_op,
         ..
     } = run_loop.counters();
     let counters = run_loop.counters();
@@ -6186,7 +6186,7 @@ fn nakamoto_attempt_time() {
         privk: Secp256k1PrivateKey,
         _address: StacksAddress,
     }
-    let num_accounts = 1_000;
+    let num_accounts = 100;
     let init_account_balance = 1_000_000_000;
     let account_keys = add_initial_balances(&mut naka_conf, num_accounts, init_account_balance);
     let mut account = account_keys
@@ -6402,7 +6402,7 @@ fn nakamoto_attempt_time() {
         .expect("Mutex poisoned")
         .get_stacks_blocks_processed();
 
-    let tx_limit = 10000;
+    let tx_limit = 1000;
     let tx_fee = 500;
     let amount = 500;
     let mut tx_total_size = 0;
@@ -9651,7 +9651,7 @@ fn run_mock_mining_ongoing_tenure_boot_test(check_empty_sortition_recovery: bool
         let follower_mined_before_empty_sortition = follower_mined_blocks.load(Ordering::SeqCst);
 
         // Force an empty sortition and ensure the restarted mock miner keeps mining afterwards.
-        counters.naka_skip_commit_op.set(true);
+        counters.skip_commit_op.set(true);
         let miner_burn_height_before = get_chain_info(&naka_conf).burn_block_height;
         let follower_burn_height_before = get_chain_info(&follower_conf).burn_block_height;
 
@@ -9678,7 +9678,7 @@ fn run_mock_mining_ongoing_tenure_boot_test(check_empty_sortition_recovery: bool
         })
         .expect("Mock miner did not continue mining after empty sortition");
         TEST_P2P_BROADCAST_STALL.set(false);
-        counters.naka_skip_commit_op.set(false);
+        counters.skip_commit_op.set(false);
     } else {
         // Confirm the restarted follower can start mining in the middle of an ongoing tenure.
         let follower_mined_before_mid_tenure = follower_mined_blocks.load(Ordering::SeqCst);
@@ -9702,7 +9702,7 @@ fn run_mock_mining_ongoing_tenure_boot_test(check_empty_sortition_recovery: bool
 
     // Best-effort reset for test globals before teardown.
     TEST_P2P_BROADCAST_STALL.set(false);
-    counters.naka_skip_commit_op.set(false);
+    counters.skip_commit_op.set(false);
 
     coord_channel
         .lock()
@@ -11373,7 +11373,7 @@ fn test_tenure_extend_from_flashblocks() {
     next_block_and_mine_commit(btc_regtest_controller, 60, &naka_conf, &counters).unwrap();
 
     // prevent the miner from sending another block-commit
-    counters.naka_skip_commit_op.set(true);
+    counters.skip_commit_op.set(true);
 
     let info_before = get_chain_info(&naka_conf);
 
@@ -11465,7 +11465,7 @@ fn test_tenure_extend_from_flashblocks() {
     }
 
     // unstall miner thread and allow block-commits again
-    counters.naka_skip_commit_op.set(false);
+    counters.skip_commit_op.set(false);
     fault_injection_unstall_miner();
 
     // wait for the miner directive to be processed
@@ -16217,7 +16217,6 @@ fn check_sip040_post_conditions() {
         get_tx_result_by_id(&mint_and_send_as_contract_originator_txid),
         Some(Value::okay_true())
     );
-    sender_nonce += 1;
 
     coord_channel
         .lock()
@@ -19321,7 +19320,7 @@ fn tenure_extend_no_commits() {
     test_observer::clear();
 
     // Skip block commits so that for the next block, there is no new commit
-    counters.naka_skip_commit_op.set(true);
+    counters.skip_commit_op.set(true);
 
     // Mine an empty Bitcoin block (no commits)
     info!("1. Mining an empty Bitcoin block, even though the miner had submitted a valid commit");