crc: code improvements from feedback

Author: hstove

stacks-signer/src/chainstate.rs

@@ -144,7 +144,7 @@ pub struct ProposalEvalConfig {
     /// Time to wait before submitting a block proposal to the stacks-node
     pub proposal_wait_for_parent_time: Duration,
     /// How many blocks after a fork should we reset the replay set,
-    /// as a failsafe mechanism?
+    /// as a failsafe mechanism
     pub reset_replay_set_after_fork_blocks: u64,
 }
 

stacks-signer/src/config.rs

@@ -51,7 +51,7 @@ const DEFAULT_TENURE_IDLE_TIMEOUT_BUFFER_SECS: u64 = 2;
 const DEFAULT_PROPOSAL_WAIT_TIME_FOR_PARENT_SECS: u64 = 15;
 /// Default number of blocks after a fork to reset the replay set,
 /// as a failsafe mechanism
-const DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS: u64 = 2;
+pub const DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS: u64 = 2;
 
 #[derive(thiserror::Error, Debug)]
 /// An error occurred parsing the provided configuration

stacks-signer/src/v0/signer_state.rs

@@ -641,7 +641,8 @@ impl LocalStateMachine {
                 proposal_config.reset_replay_set_after_fork_blocks,
             )? {
                 info!(
-                    "Signer state: replay set is stalled after 2 tenures. Clearing the replay set."
+                    "Signer state: replay set is stalled after {} tenures. Clearing the replay set.",
+                    proposal_config.reset_replay_set_after_fork_blocks
                 );
                 tx_replay_set = ReplayTransactionSet::none();
                 *tx_replay_scope = None;
@@ -1246,7 +1247,7 @@ impl LocalStateMachine {
         match replay_state {
             ReplayState::Unset => {
                 // not in replay - skip
-                return Ok(false);
+                Ok(false)
             }
             ReplayState::InProgress(_, replay_scope) => {
                 let failsafe_height =

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -103,6 +103,7 @@ use stacks_common::util::hash::{to_hex, Hash160, Sha512Trunc256Sum};
 use stacks_common::util::secp256k1::{MessageSignature, Secp256k1PrivateKey, Secp256k1PublicKey};
 use stacks_common::util::{get_epoch_time_secs, sleep_ms};
 use stacks_signer::chainstate::{ProposalEvalConfig, SortitionsView};
+use stacks_signer::config::DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS;
 use stacks_signer::signerdb::{BlockInfo, BlockState, ExtraBlockInfo, SignerDb};
 use stacks_signer::v0::SpawnedSigner;
 
@@ -6589,7 +6590,7 @@ fn signer_chainstate() {
             tenure_idle_timeout: Duration::from_secs(300),
             tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
-            reset_replay_set_after_fork_blocks: 2,
+            reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
         };
         let mut sortitions_view =
             SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
@@ -6717,7 +6718,7 @@ fn signer_chainstate() {
             tenure_idle_timeout: Duration::from_secs(300),
             tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
-            reset_replay_set_after_fork_blocks: 2,
+            reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
         };
         let burn_block_height = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
             .unwrap()
@@ -6796,7 +6797,7 @@ fn signer_chainstate() {
         tenure_idle_timeout: Duration::from_secs(300),
         tenure_idle_timeout_buffer: Duration::from_secs(2),
         reorg_attempts_activity_timeout: Duration::from_secs(30),
-        reset_replay_set_after_fork_blocks: 2,
+        reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
     };
     let mut sortitions_view = SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
     sortitions_view

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

@@ -4219,7 +4219,6 @@ fn tx_replay_disagreement() {
 /// The test flow is:
 ///
 /// - Boot to Epoch 3
-/// - Mine 3 tenures
 /// - Submit 2 STX Transfer txs (Tx1, Tx2) in the last tenure
 /// - Trigger a Bitcoin fork (3 blocks)
 /// - Verify that signers move into tx replay state [Tx1, Tx2]
@@ -4937,7 +4936,6 @@ fn tx_replay_with_fork_causing_replay_to_be_cleared_due_to_cycle() {
 /// The test flow is:
 ///
 /// - Boot to Epoch 3
-/// - Mine 10 tenures (to handle multiple fork in Cycle 12)
 /// - Deploy 1 Big Contract and mine 2 tenures (to escape fork)
 /// - Submit 2 Contract Call txs (Tx1, Tx2) in the last tenure,
 ///   requiring Tenure Extend due to Tenure Budget exceeded
@@ -5102,7 +5100,6 @@ fn tx_replay_with_fork_middle_replay_while_tenure_extending() {
 /// The test flow is:
 ///
 /// - Boot to Epoch 3
-/// - Mine 10 tenures (to handle multiple fork in Cycle 12)
 /// - Deploy 1 Big Contract and mine 2 tenures (to escape fork)
 /// - Submit 2 Contract Call txs (Tx1, Tx2) in the last tenure,
 ///   requiring Tenure Extend due to Tenure Budget exceeded