From fe429f472fe3e99b6cf1909fc5574262109fd36c Mon Sep 17 00:00:00 2001
From: Roberto De Ioris <roberto.deioris@gmail.com>
Date: Fri, 31 Jan 2025 17:56:55 +0000
Subject: [PATCH] report rejection step in miner log, ensure signe_test
 shutdown in integration test

---
 testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs | 5 +++--
 testnet/stacks-node/src/tests/signer/v0.rs                  | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs b/testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs
index 4adba66be1..7a778580d7 100644
--- a/testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs
+++ b/testnet/stacks-node/src/nakamoto_node/signer_coordinator.rs
@@ -390,7 +390,7 @@ impl SignerCoordinator {
 
             if rejections != block_status.total_reject_weight as u64 {
                 rejections = block_status.total_reject_weight as u64;
-                let rejections_timeout_tuple = self
+                let (rejections_step, new_rejections_timeout) = self
                     .block_rejection_timeout_steps
                     .range((Included(0), Included(rejections)))
                     .last()
@@ -399,10 +399,11 @@ impl SignerCoordinator {
                             "Invalid rejection timeout step function definition".into(),
                         )
                     })?;
-                rejections_timeout = rejections_timeout_tuple.1;
+                rejections_timeout = new_rejections_timeout;
                 info!("Number of received rejections updated, resetting timeout";
                                     "rejections" => rejections,
                                     "rejections_timeout" => rejections_timeout.as_secs(),
+                                    "rejections_step" => rejections_step,
                                     "rejections_threshold" => self.total_weight.saturating_sub(self.weight_threshold));
 
                 Counters::set(
diff --git a/testnet/stacks-node/src/tests/signer/v0.rs b/testnet/stacks-node/src/tests/signer/v0.rs
index 9fa4fac3c0..e055ad82f2 100644
--- a/testnet/stacks-node/src/tests/signer/v0.rs
+++ b/testnet/stacks-node/src/tests/signer/v0.rs
@@ -8111,6 +8111,9 @@ fn block_validation_check_rejection_timeout_heuristic() {
     // reset reject/ignore
     TEST_REJECT_ALL_BLOCK_PROPOSAL.set(vec![]);
     TEST_IGNORE_ALL_BLOCK_PROPOSALS.set(vec![]);
+
+    info!("------------------------- Shutdown -------------------------");
+    signer_test.shutdown();
 }
 
 /// Test scenario: