address PR review

Author: kantai

testnet/stacks-node/src/nakamoto_node/miner.rs

@@ -360,8 +360,6 @@ impl BlockMinerThread {
             self.burnchain.pox_constants.clone(),
         )
         .expect("FATAL: could not open sortition DB");
-        let burn_tip = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
-            .expect("FATAL: failed to query sortition DB for canonical burn chain tip");
 
         // Start the signer coordinator
         let mut coordinator = SignerCoordinator::new(

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

@@ -11534,14 +11534,13 @@ fn multiple_miners_empty_sortition() {
 
 #[test]
 #[ignore]
-/// This test spins up two nakamoto nodes, both configured to mine.
+/// This test spins up a single nakamoto node configured to mine.
 /// After Nakamoto blocks are mined, it waits for a normal tenure, then issues
 ///  two bitcoin blocks in quick succession -- the first will contain block commits,
 ///  and the second "flash block" will contain no block commits.
-/// The test checks if the winner of the first block is different than the previous tenure.
-/// If so, it performs the actual test: asserting that the miner wakes up and produces valid blocks.
-/// This test uses the burn-block-height to ensure consistent calculation of the burn view between
-///   the miner thread and the block processor
+/// The test then tries to continue producing a normal tenure: issuing a bitcoin block
+///   with a sortition in it.
+/// The test does 3 rounds of this to make sure that the network continues producing blocks throughout.
 fn single_miner_empty_sortition() {
     if env::var("BITCOIND_TEST") != Ok("1".into()) {
         return;
@@ -11551,52 +11550,15 @@ fn single_miner_empty_sortition() {
     let sender_addr = tests::to_addr(&sender_sk);
     let send_fee = 180;
 
-    let btc_miner_1_seed = vec![1, 1, 1, 1];
-    let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
-
-    let node_1_rpc = gen_random_port();
-    let node_1_p2p = gen_random_port();
-
-    let localhost = "127.0.0.1";
-    let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");
-
-    let max_nakamoto_tenures = 30;
     // partition the signer set so that ~half are listening and using node 1 for RPC and events,
     //  and the rest are using node 2
 
-    let mut signer_test: SignerTest<SpawnedSigner> = SignerTest::new_with_config_modifications(
-        num_signers,
-        vec![(sender_addr, send_fee * 2 * 60 + 1000)],
-        |signer_config| {
-            let node_host = &node_1_rpc_bind;
-            signer_config.node_host = node_host.to_string();
-        },
-        |config| {
-            config.node.rpc_bind = format!("{localhost}:{node_1_rpc}");
-            config.node.p2p_bind = format!("{localhost}:{node_1_p2p}");
-            config.node.data_url = format!("http://{localhost}:{node_1_rpc}");
-            config.node.p2p_address = format!("{localhost}:{node_1_p2p}");
-            config.miner.wait_on_interim_blocks = Duration::from_secs(5);
-            config.node.pox_sync_sample_secs = 30;
-            config.burnchain.pox_reward_length = Some(max_nakamoto_tenures);
-
-            config.node.seed = btc_miner_1_seed.clone();
-            config.node.local_peer_seed = btc_miner_1_seed.clone();
-            config.burnchain.local_mining_public_key = Some(btc_miner_1_pk.to_hex());
-            config.miner.mining_key = Some(Secp256k1PrivateKey::from_seed(&[1]));
-        },
-        Some(vec![btc_miner_1_pk]),
-        None,
-    );
+    let mut signer_test: SignerTest<SpawnedSigner> =
+        SignerTest::new(num_signers, vec![(sender_addr, send_fee * 2 * 60 + 1000)]);
     let conf = signer_test.running_nodes.conf.clone();
 
-    let node_1_sk = Secp256k1PrivateKey::from_seed(&conf.node.local_peer_seed);
-    let node_1_pk = StacksPublicKey::from_private(&node_1_sk);
-
     signer_test.boot_to_epoch_3();
 
-    let pre_nakamoto_peer_1_height = get_chain_info(&conf).stacks_tip_height;
-
     info!("------------------------- Reached Epoch 3.0 -------------------------");
 
     let burn_height_contract = "
@@ -11621,7 +11583,6 @@ fn single_miner_empty_sortition() {
     for _i in 0..3 {
         // Mine 1 nakamoto tenures
         info!("Mining tenure...");
-        let rl1_commits_before = rl1_commits.load(Ordering::SeqCst);
 
         signer_test.mine_block_wait_on_processing(
             &[&rl1_coord_channels],