small improvements

Author: QuantumExplorer

dash/src/hash_types.rs

@@ -223,28 +223,36 @@ impl PartialOrd for ScoreHash {
     }
 
     impl ProTxHash {
-        /// Create a Txid from a string
+        /// Create a ProTxHash from a string
         pub fn from_hex(s: &str) -> Result<ProTxHash, Error> {
             Ok(Self(sha256d::Hash::from_str(s)?))
         }
 
-        /// Convert a Txid to a string
+        /// Convert a ProTxHash to a string
         pub fn to_hex(&self) -> String {
             self.0.to_string()
         }
     }
 
         impl ScoreHash {
-        /// Create a Txid from a string
+        /// Create a ScoreHash from a string
         pub fn from_hex(s: &str) -> Result<ScoreHash, Error> {
             Ok(Self(sha256::Hash::from_str(s)?))
         }
 
-        /// Convert a Txid to a string
+        /// Convert a ScoreHash to a string
         pub fn to_hex(&self) -> String {
             self.0.to_string()
         }
 
+        /// Creates a score based on the optional confirmed hash and the quorum modifier.
+        ///
+        /// # Arguments
+        /// * `confirmed_hash_hashed_with_pro_reg_tx` - An optional hash combining the confirmed hash and ProRegTx.
+        /// * `modifier` - A quorum modifier hash used in the calculation.
+        ///
+        /// # Returns
+        /// * A hashed score derived from the input values.
         pub fn create_score(confirmed_hash_hashed_with_pro_reg_tx: Option<ConfirmedHashHashedWithProRegTx>, modifier: QuorumModifierHash) -> Self {
             let mut bytes = vec![];
             if let Some(confirmed_hash_hashed_with_pro_reg_tx) = confirmed_hash_hashed_with_pro_reg_tx{

dash/src/network/message_qrinfo.rs

@@ -154,7 +154,7 @@ impl Decodable for QRInfo {
 pub struct QuorumSnapshot {
     pub skip_list_mode: MNSkipListMode,
     pub active_quorum_members: Vec<bool>, // Bitset, length = (active_quorum_members_count + 7) / 8
-    pub skip_list: Vec<u32>,              // Array of int32_t
+    pub skip_list: Vec<u32>,              // Array of uint32_t
 }
 
 impl Display for QuorumSnapshot {

dash/src/sml/llmq_entry_verification.rs

@@ -23,12 +23,15 @@ impl Display for LLMQEntryVerificationSkipStatus {
             match self {
                 LLMQEntryVerificationSkipStatus::NotMarkedForVerification =>
                     "NotMarkedForVerification".to_string(),
-                LLMQEntryVerificationSkipStatus::MissedList(block_height) =>
-                    format!("MissedList({})", block_height),
-                LLMQEntryVerificationSkipStatus::UnknownBlock(block_hash) =>
-                    format!("UnknownBlock({})", hex::encode(block_hash)),
-                LLMQEntryVerificationSkipStatus::OtherContext(message) =>
-                    format!("OtherContext({message})"),
+                LLMQEntryVerificationSkipStatus::MissedList(block_height) => {
+                    format!("MissedList({})", block_height)
+                }
+                LLMQEntryVerificationSkipStatus::UnknownBlock(block_hash) => {
+                    format!("UnknownBlock({})", hex::encode(block_hash))
+                }
+                LLMQEntryVerificationSkipStatus::OtherContext(message) => {
+                    format!("OtherContext({message})")
+                }
             }
             .as_str(),
         )

dash/src/sml/llmq_type/mod.rs

@@ -151,17 +151,6 @@ pub const LLMQ_0024: LLMQParams = LLMQParams {
     keep_old_connections: 4,
     recovery_members: 4,
 };
-pub const LLMQ_0024_333: LLMQParams = LLMQParams {
-    quorum_type: LLMQType::LlmqtypeDevnetDIP0024,
-    name: "llmq_devnet_dip0024",
-    size: 8,
-    min_size: 6,
-    threshold: 4,
-    dkg_params: DKG_DEVNET_DIP_0024,
-    signing_active_quorum_count: 2,
-    keep_old_connections: 4,
-    recovery_members: 4,
-};
 pub const LLMQ_TEST_DIP00024: LLMQParams = LLMQParams {
     quorum_type: LLMQType::LlmqtypeTestDIP0024,
     name: "llmq_test_dip0024",

dash/src/sml/masternode_list_engine/rotated_quorum_construction.rs

@@ -382,11 +382,11 @@ impl MasternodeListEngine {
                             snapshot
                                 .skip_list
                                 .iter()
-                                .filter_map(|unskipped| {
-                                    sorted_combined_mns_list.get(*unskipped as usize)
+                                .filter_map(|not_skipped| {
+                                    sorted_combined_mns_list.get(*not_skipped as usize)
                                 })
                                 .take(quarter_size)
-                                .cloned()
+                                .copied()
                                 .collect()
                         })
                         .collect(),
@@ -400,9 +400,9 @@ impl MasternodeListEngine {
             LLMQQuarterUsageType::New(mut used_indexed_masternodes) => {
                 let mut quarter_quorum_members =
                     vec![Vec::<&QualifiedMasternodeListEntry>::new(); quorum_count];
-                let mut skip_list = Vec::<i32>::new();
-                let mut first_skipped_index = 0i32;
-                let mut idx = 0i32;
+                let mut skip_list = Vec::<u32>::new();
+                let mut first_skipped_index = 0u32;
+                let mut idx = 0u32;
                 for i in 0..quorum_count {
                     let masternodes_used_at_h_indexed_at_i = used_indexed_masternodes
                         .get_mut(i)
@@ -430,7 +430,7 @@ impl MasternodeListEngine {
                             updated = true;
                         }
                         idx += 1;
-                        if idx == sorted_combined_mns_list_len as i32 {
+                        if idx == sorted_combined_mns_list_len as u32 {
                             idx = 0;
                         }
                         if idx == initial_loop_idx {

dash/src/sml/quorum_entry/validation.rs

@@ -58,7 +58,9 @@ impl QualifiedQuorumEntry {
             .collect::<Vec<_>>();
         let sig =
             G2Element::from_bytes(self.quorum_entry.all_commitment_aggregated_signature.as_bytes())
-                .expect("expected sig");
+                .map_err(|e| {
+                    QuorumValidationError::AllCommitmentAggregatedSignatureNotValid(e.to_string())
+                })?;
         let verified = BasicSchemeMPL::new().verify_secure(public_keys2.iter(), message, &sig);
         if verified {
             Ok(())