Fix build errors due to bad merge mixed with accidental stash

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

Author: jferrant

libsigner/Cargo.toml

@@ -32,6 +32,8 @@ tiny_http = "0.12"
 mutants = "0.0.3"
 rand_core = { workspace = true }
 rand = { workspace = true }
+stacks-common = { path = "../stacks-common", features = ["testing"] }
+
 
 [dependencies.serde_json]
 version = "1.0"

libsigner/src/v0/signer_state.rs

@@ -262,6 +262,7 @@ impl PartialEq for SignerStateMachine {
         self.burn_block == other.burn_block
             && self.burn_block_height == other.burn_block_height
             && self.current_miner == other.current_miner
+            && self.active_signer_protocol_version == other.active_signer_protocol_version
             && self.tx_replay_set == other.tx_replay_set
     }
 }
@@ -281,12 +282,12 @@ impl Hash for SignerStateMachine {
 
 #[derive(Debug)]
 /// A wrapped SignerStateMachine that implements a very specific hash that enables properly ignoring the
-/// tx_replay_set when evaluating the global signer state machine
+/// tx_replay_set and update_time when evaluating the global signer state machine
 pub struct SignerStateMachineKey(SignerStateMachine);
 
 impl PartialEq for SignerStateMachineKey {
     fn eq(&self, other: &Self) -> bool {
-        // NOTE: tx_replay_set is intentionally ignored
+        // NOTE: tx_replay_set and update_time are intentionally ignored
         self.0.burn_block == other.0.burn_block
             && self.0.burn_block_height == other.0.burn_block_height
             && self.0.current_miner == other.0.current_miner
@@ -303,7 +304,6 @@ impl Hash for SignerStateMachineKey {
         self.0.burn_block_height.hash(state);
         self.0.current_miner.hash(state);
         self.0.active_signer_protocol_version.hash(state);
-        self.0.update_time.hash(state); // This doesn't actually do anything. But include for completeness sake.
     }
 }
 

stackslib/src/chainstate/burn/mod.rs

@@ -140,7 +140,7 @@ impl SortitionHash {
 
     /// Choose two indices (without replacement) from the range [0, max).
     pub fn choose_two(&self, max: u32) -> Vec<u32> {
-        let mut rng = ChaCha20Rng::from_seed(self.0.clone());
+        let mut rng = ChaCha20Rng::from_seed(self.0);
         if max < 2 {
             return (0..max).collect();
         }
@@ -158,9 +158,17 @@ impl SortitionHash {
 
     /// Convert a SortitionHash into a (little-endian) uint256
     pub fn to_uint256(&self) -> Uint256 {
-        let (u64_chunks, []) = self.0.as_chunks::<8>() else {
-            panic!("SortitionHash was not evenly divisible by 8")
-        };
+        let chunks = self.0.chunks_exact(8);
+        let remainder = chunks.remainder();
+
+        let u64_chunks: Vec<[u8; 8]> = chunks
+            .map(|chunk| chunk.try_into().expect("chunk size should be 8"))
+            .collect();
+
+        assert!(
+            remainder.is_empty(),
+            "SortitionHash was not evenly divisible by 8"
+        );
 
         let tmp: Vec<u64> = u64_chunks
             .iter()