Rename NewNakamotoBlock to NewBlock

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

libsigner/src/events.rs

@@ -114,8 +114,8 @@ pub enum SignerEvent<T: SignerEventTrait> {
         /// the time at which this event was received by the signer's event processor
         received_time: SystemTime,
     },
-    /// A new processed Nakamoto block was received from the node with the given block hash
-    NewNakamotoBlock {
+    /// A new processed Stacks block was received from the node with the given block hash
+    NewBlock {
         /// The block header hash for the newly processed stacks block
         block_hash: Sha512Trunc256Sum,
         /// The block height for the newly processed stacks block
@@ -568,7 +568,7 @@ fn process_new_block<T: SignerEventTrait>(
             Sha512Trunc256Sum::from_hex(hex)
                 .map_err(|e| EventError::Deserialize(format!("Invalid hex string: {e}")))
         })?;
-    let event = SignerEvent::NewNakamotoBlock {
+    let event = SignerEvent::NewBlock {
         block_hash,
         block_height: temp.block_height,
     };

stacks-signer/src/signerdb.rs

@@ -230,10 +230,10 @@ impl BlockInfo {
         }
         match state {
             BlockState::Unprocessed => false,
-            BlockState::LocallyAccepted | BlockState::LocallyRejected => {
-                !matches!(prev_state, BlockState::GloballyRejected)
-                    && !matches!(prev_state, BlockState::GloballyAccepted)
-            }
+            BlockState::LocallyAccepted | BlockState::LocallyRejected => !matches!(
+                prev_state,
+                BlockState::GloballyRejected | BlockState::GloballyAccepted
+            ),
             BlockState::GloballyAccepted => !matches!(prev_state, BlockState::GloballyRejected),
             BlockState::GloballyRejected => !matches!(prev_state, BlockState::GloballyAccepted),
         }

stacks-signer/src/v0/signer.rs

@@ -126,7 +126,7 @@ impl SignerTrait<SignerMessage> for Signer {
             Some(SignerEvent::BlockValidationResponse(_))
             | Some(SignerEvent::MinerMessages(..))
             | Some(SignerEvent::NewBurnBlock { .. })
-            | Some(SignerEvent::NewNakamotoBlock { .. })
+            | Some(SignerEvent::NewBlock { .. })
             | Some(SignerEvent::StatusCheck)
             | None => None,
             Some(SignerEvent::SignerMessages(msg_parity, ..)) => Some(u64::from(*msg_parity) % 2),
@@ -247,7 +247,7 @@ impl SignerTrait<SignerMessage> for Signer {
                     });
                 *sortition_state = None;
             }
-            SignerEvent::NewNakamotoBlock {
+            SignerEvent::NewBlock {
                 block_hash,
                 block_height,
             } => {
@@ -400,6 +400,7 @@ impl Signer {
             "burn_height" => block_proposal.burn_height,
         );
         crate::monitoring::increment_block_proposals_received();
+        #[allow(unused_mut)]
         let mut block_info = BlockInfo::from(block_proposal.clone());
 
         // Get sortition view if we don't have it
@@ -532,10 +533,6 @@ impl Signer {
         stacks_client: &StacksClient,
         block_response: &BlockResponse,
     ) {
-        #[cfg(any(test, feature = "testing"))]
-        if self.test_ignore_block_responses(block_response) {
-            return;
-        }
         match block_response {
             BlockResponse::Accepted(accepted) => {
                 self.handle_block_signature(stacks_client, accepted);

testnet/stacks-node/src/event_dispatcher.rs

@@ -70,10 +70,6 @@ use url::Url;
 
 use super::config::{EventKeyType, EventObserverConfig};
 
-#[cfg(test)]
-pub static TEST_SKIP_BLOCK_ANNOUNCEMENT: std::sync::Mutex<Option<bool>> =
-    std::sync::Mutex::new(None);
-
 #[derive(Debug, Clone)]
 struct EventObserver {
     /// Path to the database where pending payloads are stored. If `None`, then
@@ -1303,11 +1299,6 @@ impl EventDispatcher {
 
             let mature_rewards = serde_json::Value::Array(mature_rewards_vec);
 
-            #[cfg(any(test, feature = "testing"))]
-            if test_skip_block_announcement(&block) {
-                return;
-            }
-
             for (observer_id, filtered_events_ids) in dispatch_matrix.iter().enumerate() {
                 let filtered_events: Vec<_> = filtered_events_ids
                     .iter()
@@ -1704,18 +1695,6 @@ impl EventDispatcher {
     }
 }
 
-#[cfg(any(test, feature = "testing"))]
-fn test_skip_block_announcement(block: &StacksBlockEventData) -> bool {
-    if *TEST_SKIP_BLOCK_ANNOUNCEMENT.lock().unwrap() == Some(true) {
-        warn!(
-            "Skipping new block announcement due to testing directive";
-            "block_hash" => %block.block_hash
-        );
-        return true;
-    }
-    false
-}
-
 #[cfg(test)]
 mod test {
     use std::net::TcpListener;