chore: address PR review, uncomment CI tests

Author: kantai

.github/workflows/bitcoin-tests.yml

@@ -45,7 +45,8 @@ jobs:
           - tests::neon_integrations::liquid_ustx_integration
           - tests::neon_integrations::microblock_fork_poison_integration_test
           - tests::neon_integrations::microblock_integration_test
-          - tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
+          # Disable this flaky test. Microblocks are no longer supported anyways.
+          # - tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
           - tests::neon_integrations::microblock_limit_hit_integration_test
           - tests::neon_integrations::miner_submit_twice
           - tests::neon_integrations::mining_events_integration_test
@@ -118,11 +119,8 @@ jobs:
           - tests::nakamoto_integrations::utxo_check_on_startup_recover
           - tests::signer::v0::multiple_miners_with_nakamoto_blocks
           - tests::signer::v0::partial_tenure_fork
-          # The following 2 tests work locally, but fail on CI.
-          # Locally, they both run consistently quite quickly, but on
-          #  CI, they timeout without any logging. Disabling in CI for now.
-          # - tests::signer::v0::mine_2_nakamoto_reward_cycles
-          # - tests::signer::v0::signer_set_rollover
+          - tests::signer::v0::mine_2_nakamoto_reward_cycles
+          - tests::signer::v0::signer_set_rollover
           # 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/net/api/postblock_proposal.rs

@@ -196,11 +196,13 @@ impl NakamotoBlockProposal {
             })
     }
 
+    /// DO NOT CALL FROM CONSENSUS CODE
+    ///
     /// Check to see if a block builds atop the highest block in a given tenure.
     /// That is:
     /// - its parent must exist, and
     /// - its parent must be as high as the highest block in the given tenure.
-    pub(crate) fn check_block_builds_on_highest_block_in_tenure(
+    fn check_block_builds_on_highest_block_in_tenure(
         chainstate: &StacksChainState,
         tenure_id: &ConsensusHash,
         parent_block_id: &StacksBlockId,