chore: address more PR feedback; revert can_continue_tenure() check in relayer which was causing some CI tests fail

Author: jcnelson

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

@@ -526,7 +526,29 @@ impl RelayerThread {
                 "Relayer: did not win sortition {}, so stopping tenure",
                 &sn.sortition
             );
-            return Some(MinerDirective::StopTenure);
+
+            let mining_pkh_opt = self.get_mining_key_pkh();
+
+            match Self::can_continue_tenure(
+                &self.sortdb,
+                &mut self.chainstate,
+                sn.consensus_hash,
+                mining_pkh_opt,
+            ) {
+                Ok(Some(_)) => {
+                    // we could continue the ongoing tenure
+                    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);
+                }
+            }
         }
 
         // no sortition happened.
@@ -1722,7 +1744,7 @@ impl RelayerThread {
     }
 
     /// Try to start up a tenure-extend.
-    /// Only do this if the miner won the last-ever sortition but the burn view has changed.
+    /// Only do this if the miner won the highest valid sortition but the burn view has changed.
     /// In the future, the miner will also try to extend its tenure if a subsequent miner appears
     /// to be offline.
     fn try_continue_tenure(&mut self) {