chore: fix signer_set_rollover test

Author: kantai

stackslib/src/core/mempool.rs

@@ -2659,11 +2659,7 @@ impl MemPoolDB {
         Ok(())
     }
 
-    /// Drop and blacklist transactions, so we don't re-broadcast them or re-fetch them.
-    /// Do *NOT* remove them from the bloom filter.  This will cause them to continue to be
-    /// reported as present, which is exactly what we want because we don't want these transactions
-    /// to be seen again (so we don't want anyone accidentally "helpfully" pushing them to us, nor
-    /// do we want the mempool sync logic to "helpfully" re-discover and re-download them).
+    /// Update the time estimates for the supplied txs in the mempool db
     pub fn update_tx_time_estimates(&mut self, txs: &[(Txid, u64)]) -> Result<(), db_error> {
         let sql = "UPDATE mempool SET time_estimate_ms = ? WHERE txid = ?";
         let mempool_tx = self.tx_begin()?;

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

@@ -2974,6 +2974,7 @@ fn signer_set_rollover() {
         .running_nodes
         .btc_regtest_controller
         .get_headers_height();
+    let accounts_to_check: Vec<_> = new_signer_private_keys.iter().map(tests::to_addr).collect();
     for stacker_sk in new_signer_private_keys.iter() {
         let pox_addr = PoxAddress::from_legacy(
             AddressHashMode::SerializeP2PKH,
@@ -3017,6 +3018,13 @@ fn signer_set_rollover() {
         submit_tx(&http_origin, &stacking_tx);
     }
 
+    wait_for(60, || {
+        Ok(accounts_to_check
+            .iter()
+            .all(|acct| get_account(&http_origin, acct).nonce >= 1))
+    })
+    .expect("Timed out waiting for stacking txs to be mined");
+
     signer_test.mine_nakamoto_block(short_timeout);
 
     let next_reward_cycle = reward_cycle.saturating_add(1);