CRC: pass block info as an optonal to send_block_response_impl

Signed-off-by: Jacinta Ferrant <jacinta.ferrant@gmail.com>

Author: jferrant

stacks-signer/src/v0/signer.rs

@@ -665,12 +665,15 @@ impl Signer {
 
     /// The actual `send_block_response` implementation. Declared so that we do
     /// not need to duplicate in testing.
-    fn impl_send_block_response(&mut self, block_response: BlockResponse) {
+    fn impl_send_block_response(
+        &mut self,
+        block: Option<&NakamotoBlock>,
+        block_response: BlockResponse,
+    ) {
         info!(
             "{self}: Broadcasting a block response to stacks node: {block_response:?}";
         );
         let accepted = matches!(block_response, BlockResponse::Accepted(..));
-        let block_hash = block_response.get_signer_signature_hash();
         match self
             .stackerdb
             .send_message_with_retry::<SignerMessage>(block_response.into())
@@ -683,8 +686,8 @@ impl Signer {
                     );
                 }
                 crate::monitoring::actions::increment_block_responses_sent(accepted);
-                if let Ok(Some(block_info)) = self.signer_db.block_lookup(&block_hash) {
-                    crate::monitoring::actions::record_block_response_latency(&block_info.block);
+                if let Some(block) = block {
+                    crate::monitoring::actions::record_block_response_latency(block);
                 }
             }
             Err(e) => {
@@ -694,7 +697,11 @@ impl Signer {
     }
 
     #[cfg(any(test, feature = "testing"))]
-    fn send_block_response(&mut self, block_response: BlockResponse) {
+    fn send_block_response(
+        &mut self,
+        block: Option<&NakamotoBlock>,
+        block_response: BlockResponse,
+    ) {
         const NUM_REPEATS: usize = 1;
         let mut count = 0;
         let public_keys = TEST_REPEAT_PROPOSAL_RESPONSE.get();
@@ -704,16 +711,20 @@ impl Signer {
             count = NUM_REPEATS;
         }
         while count <= NUM_REPEATS {
-            self.impl_send_block_response(block_response.clone());
+            self.impl_send_block_response(block, block_response.clone());
 
             count += 1;
             sleep_ms(1000);
         }
     }
 
     #[cfg(not(any(test, feature = "testing")))]
-    fn send_block_response(&mut self, block_response: BlockResponse) {
-        self.impl_send_block_response(block_response)
+    fn send_block_response(
+        &mut self,
+        block: &Option<NakamotoBlock>,
+        block_response: BlockResponse,
+    ) {
+        self.impl_send_block_response(block, block_response)
     }
 
     /// Handle signer state update message
@@ -842,7 +853,7 @@ impl Signer {
 
         if let Some(block_response) = block_response {
             // We know proposal is invalid. Send rejection message, do not do further validation and do not store it.
-            self.send_block_response(block_response);
+            self.send_block_response(Some(&block_info.block), block_response);
         } else {
             // Just in case check if the last block validation submission timed out.
             self.check_submitted_block_proposal();
@@ -896,7 +907,7 @@ impl Signer {
             return;
         };
 
-        self.impl_send_block_response(block_response);
+        self.impl_send_block_response(Some(&block_info.block), block_response);
     }
 
     /// Handle block response messages from a signer
@@ -1032,7 +1043,7 @@ impl Signer {
                     warn!("{self}: Failed to mark block as locally rejected: {e:?}");
                 }
             };
-            self.impl_send_block_response(block_response);
+            self.impl_send_block_response(Some(&block_info.block), block_response);
             self.signer_db
                 .insert_block(&block_info)
                 .unwrap_or_else(|e| self.handle_insert_block_error(e));
@@ -1139,7 +1150,12 @@ impl Signer {
             .unwrap_or_else(|e| warn!("{self}: Failed to remove pending block validation: {e:?}"));
 
         if let Some(response) = block_response {
-            self.impl_send_block_response(response);
+            let block = self
+                .signer_db
+                .block_lookup(&signer_sig_hash)
+                .unwrap_or_default()
+                .map(|info| info.block);
+            self.impl_send_block_response(block.as_ref(), response);
         };
 
         // Check if there is a pending block validation that we need to submit to the node
@@ -1232,7 +1248,7 @@ impl Signer {
                 warn!("{self}: Failed to mark block as locally rejected: {e:?}");
             }
         };
-        self.impl_send_block_response(rejection);
+        self.impl_send_block_response(Some(&block_info.block), rejection);
 
         self.signer_db
             .insert_block(&block_info)