crc: code improvements from pr feedback

Author: hstove

libsigner/src/v0/signer_state.rs

@@ -136,7 +136,7 @@ impl GlobalStateEvaluator {
                         burn_block,
                         burn_block_height,
                         current_miner,
-                        ReplayTransactionSet::new(vec![]),
+                        ReplayTransactionSet::none(),
                     ),
                     StateMachineUpdateContent::V1 {
                         burn_block,
@@ -207,16 +207,8 @@ impl ReplayTransactionSet {
         self.0.is_empty()
     }
 
-    /// Unwrap the `ReplayTransactionSet`. Panics if the set is empty.
-    pub fn unwrap(self) -> Vec<StacksTransaction> {
-        if self.is_empty() {
-            panic!("Called `unwrap` on an empty `ReplayTransactionSet`");
-        }
-        self.0
-    }
-
     /// Map into an optional, returning `None` if the set is empty
-    pub fn into_optional(&self) -> Option<Vec<StacksTransaction>> {
+    pub fn clone_as_optional(&self) -> Option<Vec<StacksTransaction>> {
         if self.is_empty() {
             None
         } else {
@@ -229,7 +221,7 @@ impl ReplayTransactionSet {
         if self.is_empty() {
             vec![]
         } else {
-            self.unwrap()
+            self.0
         }
     }
 

stacks-signer/src/v0/signer.rs

@@ -1641,7 +1641,7 @@ impl Signer {
                 self.global_state_evaluator
                     .get_global_tx_replay_set()
                     .unwrap_or_default()
-                    .into_optional()
+                    .clone_as_optional()
             } else {
                 None
             },

stacks-signer/src/v0/signer_state.rs

@@ -384,7 +384,7 @@ impl LocalStateMachine {
         };
 
         if let Some(replay_set_hash) = NakamotoBlockProposal::tx_replay_hash(
-            &prior_state_machine.tx_replay_set.into_optional(),
+            &prior_state_machine.tx_replay_set.clone_as_optional(),
         ) {
             match db.get_was_block_validated_by_replay_tx(signer_signature_hash, replay_set_hash) {
                 Ok(Some(BlockValidatedByReplaySet {
@@ -674,7 +674,7 @@ impl LocalStateMachine {
                 burn_block_height: *burn_block_height,
                 current_miner: current_miner.into(),
                 active_signer_protocol_version,
-                tx_replay_set: tx_replay_set.clone(),
+                tx_replay_set,
             });
             // Because we updated our active signer protocol version, update local_update so its included in the subsequent evaluations
             let Ok(update) =
@@ -877,7 +877,7 @@ impl LocalStateMachine {
         let Self::Initialized(state) = self else {
             return None;
         };
-        state.tx_replay_set.into_optional()
+        state.tx_replay_set.clone_as_optional()
     }
 
     /// Handle a possible bitcoin fork. If a fork is detetected,

stackslib/src/net/api/postblock_proposal.rs

@@ -176,7 +176,7 @@ pub struct BlockValidateOk {
     pub size: u64,
     pub validation_time_ms: u64,
     /// If a block was validated by a transaction replay set,
-    /// then this return Some with the hash of the replay set.
+    /// then this returns `Some` with the hash of the replay set.
     pub replay_tx_hash: Option<u64>,
     /// If a block was validated by a transaction replay set,
     /// then this is true if this block exhausted the set of transactions.