chore: address PR feedback

Author: jcnelson

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

@@ -32,8 +32,7 @@ use stacks::chainstate::coordinator::OnChainRewardSetProvider;
 use stacks::chainstate::nakamoto::coordinator::load_nakamoto_reward_set;
 use stacks::chainstate::nakamoto::miner::{NakamotoBlockBuilder, NakamotoTenureInfo};
 use stacks::chainstate::nakamoto::staging_blocks::NakamotoBlockObtainMethod;
-use stacks::chainstate::nakamoto::tenure::NakamotoTenureEventId;
-use stacks::chainstate::nakamoto::{NakamotoBlock, NakamotoChainState, StacksDBIndexed};
+use stacks::chainstate::nakamoto::{NakamotoBlock, NakamotoChainState};
 use stacks::chainstate::stacks::boot::{RewardSet, MINERS_NAME};
 use stacks::chainstate::stacks::db::{StacksChainState, StacksHeaderInfo};
 use stacks::chainstate::stacks::{
@@ -1326,33 +1325,6 @@ impl BlockMinerThread {
         })
     }
 
-    /// Get the ongoing burn view in the chain state
-    pub fn get_ongoing_tenure_id(
-        sortdb: &SortitionDB,
-        chain_state: &mut StacksChainState,
-    ) -> Result<NakamotoTenureEventId, NakamotoNodeError> {
-        let cur_stacks_tip_header =
-            NakamotoChainState::get_canonical_block_header(chain_state.db(), sortdb)?
-                .ok_or_else(|| NakamotoNodeError::UnexpectedChainState)?;
-
-        let cur_stacks_tip_id = cur_stacks_tip_header.index_block_hash();
-        let ongoing_tenure_id = if let Some(tenure_id) = chain_state
-            .index_conn()
-            .get_ongoing_tenure_id(&cur_stacks_tip_id)?
-        {
-            // ongoing tenure is a Nakamoto tenure
-            tenure_id
-        } else {
-            // ongoing tenure is an epoch 2.x tenure, so it's the same as the canonical stacks 2.x
-            // tip
-            NakamotoTenureEventId {
-                burn_view_consensus_hash: cur_stacks_tip_header.consensus_hash,
-                block_id: cur_stacks_tip_id,
-            }
-        };
-        Ok(ongoing_tenure_id)
-    }
-
     /// Check if the tenure needs to change -- if so, return a BurnchainTipChanged error
     /// The tenure should change if there is a new burnchain tip with a valid sortition,
     /// or if the stacks chain state's burn view has advanced beyond our burn view.

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

@@ -530,30 +530,12 @@ impl RelayerThread {
                 });
             }
 
-            let mining_pkh_opt = self.get_mining_key_pkh();
-
             // a sortition happened, but we didn't win.
-            match Self::can_continue_tenure(
-                &self.sortdb,
-                &mut self.chainstate,
-                sn.consensus_hash,
-                mining_pkh_opt,
-            ) {
-                Ok(Some(_)) => {
-                    // we can continue our ongoing tenure, but we should give the new winning miner
-                    // a chance to send their BlockFound first.
-                    debug!("Relayer: Did not win sortition, but am mining the ongoing tenure. Allowing the new miner some time to come online before trying to continue.");
-                    self.tenure_extend_timeout = Some(Instant::now());
-                    return Some(MinerDirective::StopTenure);
-                }
-                Ok(None) => {
-                    return Some(MinerDirective::StopTenure);
-                }
-                Err(e) => {
-                    warn!("Relayer: failed to check to see if we can continue tenure: {e:?}");
-                    return Some(MinerDirective::StopTenure);
-                }
-            }
+            debug!(
+                "Relayer: did not win sortition {}, so stopping tenure",
+                &sn.sortition
+            );
+            return Some(MinerDirective::StopTenure);
         }
 
         // no sortition happened.