Skip to content

Test: Fix miner_constructs_replay_block #6399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2025
Merged

Test: Fix miner_constructs_replay_block #6399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions stacks-node/src/nakamoto_node/miner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@ pub fn fault_injection_stall_miner() {
}
}

#[cfg(test)]
/// Set the `TEST_MINE_STALL` flag to `Pending` and do not block.
pub fn fault_injection_try_stall_miner() {
let mut stall_lock = TEST_MINE_STALL.0.lock().unwrap();
if stall_lock.as_ref().is_none() || stall_lock.as_ref() == Some(&TestMineStall::NotStalled) {
*stall_lock = Some(TestMineStall::Pending);
}
}

#[cfg(test)]
/// Unstall the miner by setting the `TEST_MINE_STALL` flag to `NotStalled`.
pub fn fault_injection_unstall_miner() {
Expand Down
9 changes: 9 additions & 0 deletions stacks-node/src/nakamoto_node/relayer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,12 +899,21 @@ impl RelayerThread {
.raise_initiative("process_sortition".to_string());
return Ok(None);
}

// Reset the tenure extend time
self.tenure_extend_time = None;
let Some(mining_pk) = self.get_mining_key_pkh() else {
debug!("No mining key, will not mine");
return Ok(None);
};

let epoch = SortitionDB::get_stacks_epoch(self.sortdb.conn(), sn.block_height)
.expect("FATAL: epoch not found for current snapshot")
.expect("FATAL: epoch not found for current snapshot");
if !epoch.epoch_id.uses_nakamoto_blocks() {
return Ok(None);
}

let directive_opt = if sn.sortition {
self.choose_directive_sortition_with_winner(sn, mining_pk, committed_index_hash)
} else {
Expand Down
7 changes: 4 additions & 3 deletions stacks-node/src/tests/nakamoto_integrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ use stacks_signer::v0::SpawnedSigner;

use super::bitcoin_regtest::BitcoinCoreController;
use crate::nakamoto_node::miner::{
fault_injection_stall_miner, fault_injection_unstall_miner, TEST_BLOCK_ANNOUNCE_STALL,
TEST_BROADCAST_PROPOSAL_STALL, TEST_P2P_BROADCAST_SKIP, TEST_P2P_BROADCAST_STALL,
fault_injection_stall_miner, fault_injection_try_stall_miner, fault_injection_unstall_miner,
TEST_BLOCK_ANNOUNCE_STALL, TEST_BROADCAST_PROPOSAL_STALL, TEST_P2P_BROADCAST_SKIP,
TEST_P2P_BROADCAST_STALL,
};
use crate::nakamoto_node::relayer::TEST_MINER_THREAD_STALL;
use crate::neon::Counters;
Expand Down Expand Up @@ -12598,7 +12599,7 @@ fn miner_constructs_replay_block() {

// Pause mining to prevent any of the submitted txs getting mined.
info!("Stalling mining...");
fault_injection_stall_miner();
fault_injection_try_stall_miner();
let burn_height_before = get_chain_info(&naka_conf).burn_block_height;
// Mine 1 bitcoin block to trigger a new block found transaction
next_block_and(&mut btc_regtest_controller, 60, || {
Expand Down
Loading