Do not use a test_observer in boot_to_epoch_3 to enable use with multi node tests

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

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

@@ -63,7 +63,6 @@ use wsts::state_machine::PublicKeys;
 
 use super::nakamoto_integrations::wait_for;
 use crate::config::{Config as NeonConfig, EventKeyType, EventObserverConfig, InitialBalance};
-use crate::event_dispatcher::MinedNakamotoBlockEvent;
 use crate::neon::{Counters, TestFlag};
 use crate::run_loop::boot_nakamoto;
 use crate::tests::bitcoin_regtest::BitcoinCoreController;
@@ -364,9 +363,10 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         reward_cycle_height.saturating_sub(current_block_height)
     }
 
-    fn mine_nakamoto_block(&mut self, timeout: Duration) -> MinedNakamotoBlockEvent {
+    fn mine_nakamoto_block(&mut self, timeout: Duration) {
         let commits_submitted = self.running_nodes.commits_submitted.clone();
         let mined_block_time = Instant::now();
+        let info_before = self.stacks_client.get_peer_info().unwrap();
         next_block_and_mine_commit(
             &mut self.running_nodes.btc_regtest_controller,
             timeout.as_secs(),
@@ -376,15 +376,15 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
         .unwrap();
 
         wait_for(timeout.as_secs(), || {
-            Ok(!test_observer::get_mined_nakamoto_blocks().is_empty())
+            let info_after = self.stacks_client.get_peer_info().unwrap();
+            Ok(info_after.stacks_tip_height > info_before.stacks_tip_height)
         })
         .unwrap();
         let mined_block_elapsed_time = mined_block_time.elapsed();
         info!(
             "Nakamoto block mine time elapsed: {:?}",
             mined_block_elapsed_time
         );
-        test_observer::get_mined_nakamoto_blocks().pop().unwrap()
     }
 
     fn mine_block_wait_on_processing(

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

@@ -2954,7 +2954,8 @@ fn signer_set_rollover() {
     let transfer_tx =
         make_stacks_transfer(&sender_sk, sender_nonce, send_fee, &recipient, send_amt);
     submit_tx(&http_origin, &transfer_tx);
-    let mined_block = signer_test.mine_nakamoto_block(short_timeout);
+    signer_test.mine_nakamoto_block(short_timeout);
+    let mined_block = test_observer::get_mined_nakamoto_blocks().pop().unwrap();
     let block_sighash = mined_block.signer_signature_hash;
     let signer_signatures = mined_block.signer_signature;
 
@@ -3068,7 +3069,8 @@ fn signer_set_rollover() {
     let transfer_tx =
         make_stacks_transfer(&sender_sk, sender_nonce, send_fee, &recipient, send_amt);
     submit_tx(&http_origin, &transfer_tx);
-    let mined_block = signer_test.mine_nakamoto_block(short_timeout);
+    signer_test.mine_nakamoto_block(short_timeout);
+    let mined_block = test_observer::get_mined_nakamoto_blocks().pop().unwrap();
 
     info!("---- Verifying that the new signers signed the block -----");
     let signer_signatures = mined_block.signer_signature;

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

@@ -202,7 +202,8 @@ impl SignerTest<SpawnedSigner> {
         agg_key: &Point,
         timeout: Duration,
     ) -> MinedNakamotoBlockEvent {
-        let new_block = self.mine_nakamoto_block(timeout);
+        self.mine_nakamoto_block(timeout);
+        let new_block = test_observer::get_mined_nakamoto_blocks().pop().unwrap();
         let signer_sighash = new_block.signer_signature_hash.clone();
         let signature = self.wait_for_confirmed_block_v1(&signer_sighash, timeout);
         assert!(signature.0.verify(&agg_key, signer_sighash.as_bytes()));
@@ -1130,7 +1131,8 @@ fn sign_after_signer_reboot() {
 
     info!("------------------------- Test Mine Block after restart -------------------------");
 
-    let last_block = signer_test.mine_nakamoto_block(timeout);
+    signer_test.mine_nakamoto_block(timeout);
+    let last_block = test_observer::get_mined_nakamoto_blocks().pop().unwrap();
     let proposed_signer_signature_hash = signer_test
         .wait_for_validate_ok_response(short_timeout)
         .signer_signature_hash;