fixes

Author: QuantumExplorer

dash/src/network/message.rs

@@ -239,9 +239,9 @@ pub enum NetworkMessage {
     /// `mnlistdiff`
     MnListDiff(message_sml::MnListDiff),
     /// `getqrinfo`
-    GetQRInfo(message_qrinfo::GetQrInfo),
+    GetQRInfo(message_qrinfo::GetQRInfo),
     /// `qrinfo`
-    QrInfo(message_qrinfo::QrInfo),
+    QRInfo(message_qrinfo::QRInfo),
     /// Any other message.
     Unknown {
         /// The command of this message.
@@ -298,7 +298,7 @@ impl NetworkMessage {
             NetworkMessage::GetMnListD(_) => "getmnlistd",
             NetworkMessage::MnListDiff(_) => "mnlistdiff",
             NetworkMessage::GetQRInfo(_) => "getqrinfo",
-            NetworkMessage::QrInfo(_) => "qrinfo",
+            NetworkMessage::QRInfo(_) => "qrinfo",
             NetworkMessage::Unknown { .. } => "unknown",
         }
     }
@@ -385,7 +385,7 @@ impl Encodable for RawNetworkMessage {
             NetworkMessage::GetMnListD(ref dat) => serialize(dat),
             NetworkMessage::MnListDiff(ref dat) => serialize(dat),
             NetworkMessage::GetQRInfo(ref dat) => serialize(dat),
-            NetworkMessage::QrInfo(ref dat) => serialize(dat),
+            NetworkMessage::QRInfo(ref dat) => serialize(dat),
         })
         .consensus_encode(w)?;
         Ok(len)

dash/src/network/message_qrinfo.rs

@@ -13,13 +13,13 @@ use crate::network::message_sml::MnListDiff;
 /// - `block_request_hash`: Hash of the block for which the masternode list diff is requested
 /// - `extra_share`: Optional flag to indicate if an extra share is requested (defaults to false)
 #[derive(PartialEq, Eq, Clone, Debug)]
-pub struct GetQrInfo {
+pub struct GetQRInfo {
     pub base_block_hashes: Vec<BlockHash>,
     pub block_request_hash: BlockHash,
     pub extra_share: bool,
 }
 
-impl_consensus_encoding!(GetQrInfo,
+impl_consensus_encoding!(GetQRInfo,
     base_block_hashes,
     block_request_hash,
     extra_share
@@ -31,7 +31,7 @@ impl_consensus_encoding!(GetQrInfo,
 ///
 /// Note: The “compact size” integers that prefix some arrays are handled by your consensus encoding routines.
 #[derive(PartialEq, Eq, Clone, Debug)]
-pub struct QrInfo {
+pub struct QRInfo {
     // Quorum snapshots for heights h-c, h-2c, h-3c.
     pub quorum_snapshot_at_h_minus_c: QuorumSnapshot,
     pub quorum_snapshot_at_h_minus_2c: QuorumSnapshot,
@@ -60,7 +60,7 @@ pub struct QrInfo {
     pub mn_list_diff_list: Vec<MnListDiff>,
 }
 
-impl Encodable for QrInfo {
+impl Encodable for QRInfo {
     fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
         let mut len = 0;
         // Encode the three required quorum snapshots.
@@ -90,7 +90,7 @@ impl Encodable for QrInfo {
     }
 }
 
-impl Decodable for QrInfo {
+impl Decodable for QRInfo {
     fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
         // Decode the three quorum snapshots.
         let quorum_snapshot_at_h_minus_c = QuorumSnapshot::consensus_decode(r)?;
@@ -119,7 +119,7 @@ impl Decodable for QrInfo {
         let quorum_snapshot_list = Vec::consensus_decode(r)?;
         let mn_list_diff_list = Vec::consensus_decode(r)?;
 
-        Ok(QrInfo {
+        Ok(QRInfo {
             quorum_snapshot_at_h_minus_c,
             quorum_snapshot_at_h_minus_2c,
             quorum_snapshot_at_h_minus_3c,

dash/src/sml/masternode_list/quorum_helpers.rs

@@ -30,6 +30,14 @@ impl MasternodeList {
             .collect()
     }
 
+    pub fn rotating_quorum_hashes(&self, exclude_quorum_types: &[LLMQType]) -> BTreeSet<QuorumHash> {
+        self.quorums
+            .iter()
+            .filter(|(llmq_type, _)| llmq_type.is_rotating_quorum_type() && !exclude_quorum_types.contains(llmq_type))
+            .flat_map(|(_, quorums)| quorums.keys().cloned())
+            .collect()
+    }
+
     pub fn quorum_entry_of_type_for_quorum_hash(
         &self,
         llmq_type: LLMQType,

dash/src/sml/masternode_list_engine/mod.rs

@@ -59,6 +59,12 @@ impl MasternodeListEngine {
             .unwrap_or_default()
     }
 
+    pub fn latest_masternode_list_rotating_quorum_hashes(&self, exclude_quorum_types: &[LLMQType]) -> BTreeSet<QuorumHash> {
+        self.latest_masternode_list()
+            .map(|list| list.rotating_quorum_hashes(exclude_quorum_types))
+            .unwrap_or_default()
+    }
+
     pub fn masternode_list_and_height_for_block_hash_8_blocks_ago(
         &self,
         block_hash: &BlockHash,