chore: fix unit test, add integration test to github workflow

Author: kantai

.github/workflows/bitcoin-tests.yml

@@ -97,6 +97,7 @@ jobs:
           - tests::nakamoto_integrations::check_block_info
           - tests::nakamoto_integrations::check_block_info_rewards
           - tests::nakamoto_integrations::continue_tenure_extend
+          - tests::nakamoto_integrations::multiple_miners
           # Do not run this one until we figure out why it fails in CI
           # - tests::neon_integrations::bitcoin_reorg_flap
           # - tests::neon_integrations::bitcoin_reorg_flap_with_follower

stackslib/src/chainstate/nakamoto/mod.rs

@@ -455,13 +455,17 @@ impl MaturedMinerPaymentSchedules {
     }
 }
 
+/// Struct containing information about the miners assigned in the
+/// .miners stackerdb config
 pub struct MinersDBInformation {
     signer_0_sortition: ConsensusHash,
     signer_1_sortition: ConsensusHash,
     latest_winner: u16,
 }
 
 impl MinersDBInformation {
+    /// What index in the `.miners` stackerdb is the miner who won
+    /// `sortition`?
     pub fn get_signer_index(&self, sortition: &ConsensusHash) -> Option<u16> {
         if sortition == &self.signer_0_sortition {
             Some(0)
@@ -472,6 +476,12 @@ impl MinersDBInformation {
         }
     }
 
+    /// Get all of the sortitions whose winners are included in .miners
+    pub fn get_sortitions(&self) -> [&ConsensusHash; 2] {
+        [&self.signer_0_sortition, &self.signer_1_sortition]
+    }
+
+    /// Get the index of the latest sortition winner in .miners
     pub fn get_latest_winner_index(&self) -> u16 {
         self.latest_winner
     }
@@ -4160,14 +4170,18 @@ impl NakamotoChainState {
             .map(usize::from)
         else {
             warn!("Miner is not in the miners StackerDB config";
-                  "stackerdb_slots" => format!("{:?}", &stackerdb_config.signers));
+                  "stackerdb_slots" => ?stackerdb_config.signers,
+                  "queried_sortition" => %election_sortition,
+                  "sortition_hashes" => ?miners_info.get_sortitions());
             return Ok(None);
         };
         let mut signer_ranges = stackerdb_config.signer_ranges();
         if signer_ix >= signer_ranges.len() {
             // should be unreachable, but always good to be careful
             warn!("Miner is not in the miners StackerDB config";
-                  "stackerdb_slots" => format!("{:?}", &stackerdb_config.signers));
+                  "stackerdb_slots" => ?stackerdb_config.signers,
+                  "queried_sortition" => %election_sortition,
+                  "sortition_hashes" => ?miners_info.get_sortitions());
 
             return Ok(None);
         }

stackslib/src/chainstate/nakamoto/tests/mod.rs

@@ -2080,9 +2080,8 @@ fn test_make_miners_stackerdb_config() {
         let tip = SortitionDB::get_canonical_burn_chain_tip(sort_db.conn()).unwrap();
         let miner_privkey = &miner_keys[i];
         let miner_pubkey = StacksPublicKey::from_private(miner_privkey);
-        let slot_id =
-            NakamotoChainState::get_miner_slot(&sort_db, &tip, &block.header.consensus_hash)
-                .expect("Failed to get miner slot");
+        let slot_id = NakamotoChainState::get_miner_slot(&sort_db, &tip, &tip.consensus_hash)
+            .expect("Failed to get miner slot");
         if sortition {
             let slot_id = slot_id.expect("No miner slot exists for this miner").start;
             let slot_version = stackerdbs

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -1571,14 +1571,15 @@ fn mine_multiple_per_tenure_integration() {
 
 #[test]
 #[ignore]
-/// This test spins up a nakamoto-neon node.
+/// This test spins up two nakamoto nodes, both configured to mine.
 /// It starts in Epoch 2.0, mines with `neon_node` to Epoch 3.0, and then switches
 ///  to Nakamoto operation (activating pox-4 by submitting a stack-stx tx). The BootLoop
 ///  struct handles the epoch-2/3 tear-down and spin-up.
 /// This test makes three assertions:
-///  * 5 tenures are mined after 3.0 starts
-///  * Each tenure has 10 blocks (the coinbase block and 9 interim blocks)
-fn multiple_nodes() {
+///  * 15 tenures are mined after 3.0 starts
+///  * Each tenure has 6 blocks (the coinbase block and 5 interim blocks)
+///  * Both nodes see the same chainstate at the end of the test
+fn multiple_miners() {
     if env::var("BITCOIND_TEST") != Ok("1".into()) {
         return;
     }
@@ -1683,7 +1684,7 @@ fn multiple_nodes() {
     let coord_channel = run_loop.coordinator_channels();
     let coord_channel_2 = run_loop_2.coordinator_channels();
 
-    let run_loop_2_thread = thread::Builder::new()
+    let _run_loop_2_thread = thread::Builder::new()
         .name("run_loop_2".into())
         .spawn(move || run_loop_2.start(None, 0))
         .unwrap();
@@ -1733,11 +1734,7 @@ fn multiple_nodes() {
     info!("Neighbors 2"; "neighbors" => ?get_neighbors(&conf_node_2));
 
     // Wait one block to confirm the VRF register, wait until a block commit is submitted
-    next_block_and(&mut btc_regtest_controller, 60, || {
-        let commits_count = commits_submitted.load(Ordering::SeqCst);
-        Ok(commits_count >= 1)
-    })
-    .unwrap();
+    wait_for_first_naka_block_commit(60, &commits_submitted);
 
     // Mine `tenure_count` nakamoto tenures
     for tenure_ix in 0..tenure_count {
@@ -1799,8 +1796,10 @@ fn multiple_nodes() {
         "is_nakamoto" => tip.anchored_header.as_stacks_nakamoto().is_some(),
     );
 
-    info!("Peer 1 information"; "chain_info" => ?get_chain_info(&naka_conf).stacks_tip_height);
-    info!("Peer 2 information"; "chain_info" => ?get_chain_info(&conf_node_2).stacks_tip_height);
+    let peer_1_height = get_chain_info(&naka_conf).stacks_tip_height;
+    let peer_2_height = get_chain_info(&conf_node_2).stacks_tip_height;
+    info!("Peer height information"; "peer_1" => peer_1_height, "peer_2" => peer_2_height);
+    assert_eq!(peer_1_height, peer_2_height);
 
     assert!(tip.anchored_header.as_stacks_nakamoto().is_some());
     assert_eq!(
@@ -1821,7 +1820,6 @@ fn multiple_nodes() {
     run_loop_2_stopper.store(false, Ordering::SeqCst);
 
     run_loop_thread.join().unwrap();
-    //    run_loop_2_thread.join().unwrap();
 }
 
 #[test]