test: another attempt at de-flaking

Author: kantai

testnet/stacks-node/src/tests/signer/mod.rs

@@ -60,7 +60,7 @@ use stacks_signer::{Signer, SpawnedSigner};
 use super::nakamoto_integrations::{
     check_nakamoto_empty_block_heuristics, next_block_and, wait_for,
 };
-use super::neon_integrations::{get_account, get_sortition_info_ch, submit_tx_fallible};
+use super::neon_integrations::{get_account, get_sortition_info_ch, submit_tx_fallible, Account};
 use crate::neon::Counters;
 use crate::run_loop::boot_nakamoto;
 use crate::tests::bitcoin_regtest::BitcoinCoreController;
@@ -476,6 +476,11 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         submit_tx_fallible(&http_origin, &contract_tx).map(|resp| (resp, sender_nonce))
     }
 
+    pub fn get_account<F: std::fmt::Display>(&self, account: &F) -> Account {
+        let http_origin = format!("http://{}", &self.running_nodes.conf.node.rpc_bind);
+        get_account(&http_origin, account)
+    }
+
     /// Submit a contract call and return (txid, sender_nonce)
     pub fn submit_contract_call(
         &self,

testnet/stacks-node/src/tests/signer/v0.rs

@@ -51,7 +51,7 @@ use stacks::config::{Config as NeonConfig, EventKeyType, EventObserverConfig};
 use stacks::core::mempool::MemPoolWalkStrategy;
 use stacks::core::test_util::{
     insert_tx_in_mempool, make_contract_call, make_contract_publish,
-    make_stacks_transfer_serialized,
+    make_stacks_transfer_serialized, to_addr,
 };
 use stacks::core::{StacksEpochId, CHAIN_ID_TESTNET};
 use stacks::libstackerdb::StackerDBChunkData;
@@ -15424,6 +15424,11 @@ fn bitcoin_reorg_extended_tenure() {
             .expect("Timed out waiting for contract-call");
     }
 
+    let last_nonce = miners
+        .signer_test
+        .get_account(&to_addr(&miners.sender_sk))
+        .nonce;
+
     info!("------------------------- Triggering Bitcoin Fork -------------------------");
 
     let burn_block_height = get_chain_info(&conf_1).burn_block_height;
@@ -15460,12 +15465,14 @@ fn bitcoin_reorg_extended_tenure() {
 
     info!("Chain info after fork: {:?}", get_chain_info(&conf_1));
 
-    // get at least one block produced before we stall broadcasts
+    // get blocks produced with the "reorged" txs before we stall broadcasts
     //  to check signer approvals
     miners
         .signer_test
-        .submit_burn_block_call_and_wait(&miners.sender_sk)
-        .expect("Timed out waiting for contract-call");
+        .wait_for_nonce_increase(&to_addr(&miners.sender_sk), last_nonce - 1)
+        .unwrap();
+
+    miners.wait_for_chains(60);
 
     // stall p2p broadcast and signer block announcements
     //  so that we can ensure all the signers approve the proposal