CRC: address nits

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

Author: jferrant

stacks-node/src/tests/signer/v0.rs

@@ -94,8 +94,8 @@ use stacks_signer::v0::signer_state::{
 use stacks_signer::v0::tests::{
     TEST_IGNORE_ALL_BLOCK_PROPOSALS, TEST_PAUSE_BLOCK_BROADCAST,
     TEST_PIN_SUPPORTED_SIGNER_PROTOCOL_VERSION, TEST_REJECT_ALL_BLOCK_PROPOSAL,
-    TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST, TEST_SKIP_BLOCK_BROADCAST, TEST_SKIP_SIGNER_CLEANUP,
-    TEST_STALL_BLOCK_VALIDATION_SUBMISSION,
+    TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST, TEST_SKIP_BLOCK_BROADCAST,
+    TEST_SKIP_SIGNER_CLEANUP, TEST_STALL_BLOCK_VALIDATION_SUBMISSION,
 };
 use stacks_signer::v0::SpawnedSigner;
 use tracing_subscriber::prelude::*;
@@ -9403,7 +9403,7 @@ fn reorg_locally_accepted_blocks_across_tenures_succeeds() {
         .cloned()
         .skip(num_signers * 7 / 10)
         .collect();
-    TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST.set(ignoring_signers.clone());
+    TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST.set(ignoring_signers.clone());
     // Clear the stackerdb chunks
     test_observer::clear();
 
@@ -9471,7 +9471,7 @@ fn reorg_locally_accepted_blocks_across_tenures_succeeds() {
     );
     let info_before = signer_test.get_peer_info();
     test_observer::clear();
-    TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST.set(Vec::new());
+    TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST.set(Vec::new());
     TEST_MINE_SKIP.set(false);
 
     let block_n_1_prime =
@@ -9615,7 +9615,7 @@ fn reorg_locally_accepted_blocks_across_tenures_fails() {
         .cloned()
         .skip(num_signers * 7 / 10)
         .collect();
-    TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST.set(ignoring_signers.clone());
+    TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST.set(ignoring_signers.clone());
     // Clear the stackerdb chunks
     test_observer::clear();
 
@@ -12809,7 +12809,7 @@ fn injected_signatures_are_ignored_across_boundaries() {
         .collect();
     assert_eq!(ignoring_signers.len(), 3);
     assert_eq!(non_ignoring_signers.len(), 2);
-    TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST.set(ignoring_signers.clone());
+    TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST.set(ignoring_signers.clone());
 
     let info_before = signer_test.get_peer_info();
     // submit a tx so that the miner will ATTEMPT to mine a stacks block N
@@ -18280,16 +18280,9 @@ fn signers_do_not_commit_unless_threshold_precommitted() {
 
     // Make sure that more than 30% of signers are set to ignore any incoming proposals so that consensus is not reached
     // on pre-commit round.
-    let ignore_signers: Vec<_> = all_signers
-        .iter()
-        .cloned()
-        .take(all_signers.len() / 2)
-        .collect();
-    let pre_commit_signers: Vec<_> = all_signers
-        .iter()
-        .cloned()
-        .skip(all_signers.len() / 2)
-        .collect();
+    let (ignore_slice, pre_commit_slice) = all_signers.split_at(all_signers.len() / 2);
+    let ignore_signers: Vec<_> = ignore_slice.to_vec();
+    let pre_commit_signers: Vec<_> = pre_commit_slice.to_vec();
     TEST_IGNORE_ALL_BLOCK_PROPOSALS.set(ignore_signers);
     test_observer::clear();
     let blocks_before = test_observer::get_mined_nakamoto_blocks().len();

stacks-signer/src/v0/signer.rs

@@ -35,9 +35,8 @@ use clarity::util::sleep_ms;
 #[cfg(any(test, feature = "testing"))]
 use clarity::util::tests::TestFlag;
 use libsigner::v0::messages::{
-    BlockAccepted, BlockRejection, BlockResponse, BlockResponseData, MessageSlotID, MockProposal,
-    MockSignature, RejectReason, RejectReasonPrefix, SignerMessage, SignerMessageMetadata,
-    StateMachineUpdate,
+    BlockAccepted, BlockRejection, BlockResponse, MessageSlotID, MockProposal, MockSignature,
+    RejectReason, RejectReasonPrefix, SignerMessage, StateMachineUpdate,
 };
 use libsigner::v0::signer_state::GlobalStateEvaluator;
 use libsigner::{BlockProposal, SignerEvent, SignerSession};
@@ -468,21 +467,17 @@ impl Signer {
             .private_key
             .sign(block.header.signer_signature_hash().bits())
             .expect("Failed to sign block");
-        BlockAccepted {
-            signer_signature_hash: block.header.signer_signature_hash(),
+        BlockAccepted::new(
+            block.header.signer_signature_hash(),
             signature,
-            metadata: SignerMessageMetadata::default(),
-            response_data: BlockResponseData::new(
-                self.signer_db.calculate_tenure_extend_timestamp(
-                    self.proposal_config
-                        .tenure_idle_timeout
-                        .saturating_add(self.proposal_config.tenure_idle_timeout_buffer),
-                    block,
-                    true,
-                ),
-                RejectReason::NotRejected,
+            self.signer_db.calculate_tenure_extend_timestamp(
+                self.proposal_config
+                    .tenure_idle_timeout
+                    .saturating_add(self.proposal_config.tenure_idle_timeout_buffer),
+                block,
+                true,
             ),
-        }
+        )
     }
 
     /// The actual switch-on-event processing of an event.
@@ -907,7 +902,7 @@ impl Signer {
 
     #[cfg(any(test, feature = "testing"))]
     fn send_block_response(&mut self, block: &NakamotoBlock, block_response: BlockResponse) {
-        if self.test_skip_signature_broadcast(&block_response) {
+        if self.test_skip_block_response_broadcast(&block_response) {
             return;
         }
         const NUM_REPEATS: usize = 1;

stacks-signer/src/v0/tests.rs

@@ -54,7 +54,7 @@ pub static TEST_STALL_BLOCK_VALIDATION_SUBMISSION: LazyLock<TestFlag<bool>> =
 pub static TEST_SKIP_SIGNER_CLEANUP: LazyLock<TestFlag<bool>> = LazyLock::new(TestFlag::default);
 
 /// A global variable that can be used to skip signature broadcast if the signer's public key is in the provided list
-pub static TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST: LazyLock<TestFlag<Vec<StacksPublicKey>>> =
+pub static TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST: LazyLock<TestFlag<Vec<StacksPublicKey>>> =
     LazyLock::new(TestFlag::default);
 
 impl Signer {
@@ -174,13 +174,13 @@ impl Signer {
         self.supported_signer_protocol_version
     }
 
-    /// Skip the block broadcast if the TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST flag is set for the signer
-    pub fn test_skip_signature_broadcast(&self, block_response: &BlockResponse) -> bool {
+    /// Skip the block broadcast if the TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST flag is set for the signer
+    pub fn test_skip_block_response_broadcast(&self, block_response: &BlockResponse) -> bool {
         if block_response.as_block_accepted().is_none() {
             return false;
         }
         let hash = block_response.get_signer_signature_hash();
-        let public_keys = TEST_SIGNERS_SKIP_SIGNATURE_BROADCAST.get();
+        let public_keys = TEST_SIGNERS_SKIP_BLOCK_RESPONSE_BROADCAST.get();
         if public_keys.contains(
             &stacks_common::types::chainstate::StacksPublicKey::from_private(&self.private_key),
         ) {