refactor: clean up mock-mining changes for readability

Author: obycode

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

@@ -41,6 +41,7 @@ use stacks::net::p2p::NetworkHandle;
 use stacks::net::stackerdb::StackerDBs;
 use stacks::net::{NakamotoBlocksData, StacksMessageType};
 use stacks::util::get_epoch_time_secs;
+use stacks::util::secp256k1::MessageSignature;
 use stacks_common::types::chainstate::{StacksAddress, StacksBlockId};
 use stacks_common::types::{PrivateKey, StacksEpochId};
 use stacks_common::util::vrf::VRFProof;
@@ -422,64 +423,48 @@ impl BlockMinerThread {
 
         if let Some(mut new_block) = new_block {
             Self::fault_injection_block_broadcast_stall(&new_block);
-
-            let signer_signature = if self.config.get_node_config(false).mock_mining {
-                // If we're mock mining, we don't actually propose the block.
-                Vec::new()
-            } else {
-                let mut chain_state = neon_node::open_chainstate_with_faults(&self.config)
-                    .map_err(|e| {
-                        NakamotoNodeError::SigningCoordinatorFailure(format!(
-                            "Failed to open chainstate DB. Cannot mine! {e:?}"
-                        ))
-                    })?;
-                match coordinator.propose_block(
-                    &mut new_block,
-                    &self.burn_block,
-                    &self.burnchain,
-                    &sortdb,
-                    &mut chain_state,
-                    stackerdbs,
-                    &self.globals.counters,
-                    &self.burn_election_block.consensus_hash,
-                ) {
-                    Ok(x) => x,
-                    Err(e) => match e {
-                        NakamotoNodeError::StacksTipChanged => {
-                            info!("Stacks tip changed while waiting for signatures";
-                                "signer_sighash" => %new_block.header.signer_signature_hash(),
-                                "block_height" => new_block.header.chain_length,
-                                "consensus_hash" => %new_block.header.consensus_hash,
-                            );
-                            return Err(e);
-                        }
-                        NakamotoNodeError::BurnchainTipChanged => {
-                            info!("Burnchain tip changed while waiting for signatures";
-                                "signer_sighash" => %new_block.header.signer_signature_hash(),
-                                "block_height" => new_block.header.chain_length,
-                                "consensus_hash" => %new_block.header.consensus_hash,
-                            );
-                            return Err(e);
-                        }
-                        _ => {
-                            // Sleep for a bit to allow signers to catch up
-                            let pause_ms = if *last_block_rejected {
-                                self.config.miner.subsequent_rejection_pause_ms
-                            } else {
-                                self.config.miner.first_rejection_pause_ms
-                            };
-
-                            error!("Error while gathering signatures: {e:?}. Will try mining again in {pause_ms}.";
-                                "signer_sighash" => %new_block.header.signer_signature_hash(),
-                                "block_height" => new_block.header.chain_length,
-                                "consensus_hash" => %new_block.header.consensus_hash,
-                            );
-                            thread::sleep(Duration::from_millis(pause_ms));
-                            *last_block_rejected = true;
-                            return Ok(());
-                        }
-                    },
-                }
+            let signer_signature = match self.propose_block(
+                coordinator,
+                &mut new_block,
+                sortdb,
+                stackerdbs,
+            ) {
+                Ok(x) => x,
+                Err(e) => match e {
+                    NakamotoNodeError::StacksTipChanged => {
+                        info!("Stacks tip changed while waiting for signatures";
+                            "signer_sighash" => %new_block.header.signer_signature_hash(),
+                            "block_height" => new_block.header.chain_length,
+                            "consensus_hash" => %new_block.header.consensus_hash,
+                        );
+                        return Err(e);
+                    }
+                    NakamotoNodeError::BurnchainTipChanged => {
+                        info!("Burnchain tip changed while waiting for signatures";
+                            "signer_sighash" => %new_block.header.signer_signature_hash(),
+                            "block_height" => new_block.header.chain_length,
+                            "consensus_hash" => %new_block.header.consensus_hash,
+                        );
+                        return Err(e);
+                    }
+                    _ => {
+                        // Sleep for a bit to allow signers to catch up
+                        let pause_ms = if *last_block_rejected {
+                            self.config.miner.subsequent_rejection_pause_ms
+                        } else {
+                            self.config.miner.first_rejection_pause_ms
+                        };
+
+                        error!("Error while gathering signatures: {e:?}. Will try mining again in {pause_ms}.";
+                            "signer_sighash" => %new_block.header.signer_signature_hash(),
+                            "block_height" => new_block.header.chain_length,
+                            "consensus_hash" => %new_block.header.consensus_hash,
+                        );
+                        thread::sleep(Duration::from_millis(pause_ms));
+                        *last_block_rejected = true;
+                        return Ok(());
+                    }
+                },
             };
             *last_block_rejected = false;
 
@@ -533,6 +518,36 @@ impl BlockMinerThread {
         Ok(())
     }
 
+    fn propose_block(
+        &self,
+        coordinator: &mut SignerCoordinator,
+        new_block: &mut NakamotoBlock,
+        sortdb: &SortitionDB,
+        stackerdbs: &mut StackerDBs,
+    ) -> Result<Vec<MessageSignature>, NakamotoNodeError> {
+        if self.config.get_node_config(false).mock_mining {
+            // If we're mock mining, we don't actually propose the block.
+            return Ok(Vec::new());
+        }
+
+        let mut chain_state =
+            neon_node::open_chainstate_with_faults(&self.config).map_err(|e| {
+                NakamotoNodeError::SigningCoordinatorFailure(format!(
+                    "Failed to open chainstate DB. Cannot mine! {e:?}"
+                ))
+            })?;
+        coordinator.propose_block(
+            new_block,
+            &self.burn_block,
+            &self.burnchain,
+            sortdb,
+            &mut chain_state,
+            stackerdbs,
+            &self.globals.counters,
+            &self.burn_election_block.consensus_hash,
+        )
+    }
+
     /// Load the signer set active for this miner's blocks. This is the
     ///  active reward set during `self.burn_election_block`. The miner
     ///  thread caches this information, and this method will consult