refactor: introduce MasternodeListBuilder

Author: shumkov

dash/src/sml/masternode_list/apply_diff.rs

@@ -1,7 +1,7 @@
 use crate::network::message_sml::MnListDiff;
 use crate::prelude::CoreBlockHeight;
 use crate::sml::error::SmlError;
-use crate::sml::masternode_list::MasternodeList;
+use crate::sml::masternode_list::{MasternodeList, MasternodeListBuilder};
 
 impl MasternodeList {
     /// Applies an `MnListDiff` to update the current masternode list.
@@ -76,12 +76,13 @@ impl MasternodeList {
         }
 
         // Create and return the new MasternodeList
-        Ok(MasternodeList::new(
+        let builder = MasternodeListBuilder::new(
             updated_masternodes,
             updated_quorums,
             diff.block_hash,
-            diff_end_height,
-            true, // Assume quorums are active
-        ))
+            diff_end_height, 
+        );
+        
+        Ok(builder.build())
     }
 }

dash/src/sml/masternode_list/builder.rs

@@ -0,0 +1,66 @@
+use std::collections::BTreeMap;
+use crate::{BlockHash, ProTxHash, QuorumHash};
+use crate::hash_types::{MerkleRootMasternodeList, MerkleRootQuorums};
+use crate::sml::llmq_type::LLMQType;
+use crate::sml::masternode_list::MasternodeList;
+use crate::sml::masternode_list_entry::qualified_masternode_list_entry::QualifiedMasternodeListEntry;
+use crate::sml::quorum_entry::qualified_quorum_entry::QualifiedQuorumEntry;
+
+pub struct MasternodeListBuilder {
+    pub block_hash: BlockHash,
+    pub block_height: u32,
+    pub masternode_merkle_root: Option<MerkleRootMasternodeList>,
+    pub llmq_merkle_root: Option<MerkleRootQuorums>,
+    pub masternodes: BTreeMap<ProTxHash, QualifiedMasternodeListEntry>,
+    pub quorums: BTreeMap<LLMQType, BTreeMap<QuorumHash, QualifiedQuorumEntry>>,
+}
+
+impl MasternodeListBuilder {
+    pub fn empty(block_hash: BlockHash, block_height: u32) -> Self {
+        Self::new(BTreeMap::default(), BTreeMap::new(), block_hash, block_height)
+    }
+
+    pub fn new(
+        masternodes: BTreeMap<ProTxHash, QualifiedMasternodeListEntry>,
+        quorums: BTreeMap<LLMQType, BTreeMap<QuorumHash, QualifiedQuorumEntry>>,
+        block_hash: BlockHash,
+        block_height: u32,
+    ) -> Self {
+        Self {
+            quorums,
+            block_hash,
+            block_height,
+            masternode_merkle_root: None,
+            llmq_merkle_root: None,
+            masternodes,
+        }
+    }
+
+    pub fn with_merkle_roots(
+        mut self,
+        masternode_merkle_root: MerkleRootMasternodeList,
+        llmq_merkle_root: Option<MerkleRootQuorums>,
+    ) -> Self {
+        self.masternode_merkle_root = Some(masternode_merkle_root);
+        self.llmq_merkle_root = llmq_merkle_root;
+        self
+    }
+
+    pub fn build(self) -> MasternodeList {
+        let mut list = MasternodeList {
+            block_hash: self.block_hash,
+            known_height: self.block_height,
+            masternode_merkle_root: self.masternode_merkle_root,
+            llmq_merkle_root: self.llmq_merkle_root,
+            masternodes: self.masternodes,
+            quorums: self.quorums,
+        };
+
+        if self.masternode_merkle_root.is_none() {
+            list.masternode_merkle_root = list.calculate_masternodes_merkle_root(self.block_height);
+            list.llmq_merkle_root = list.calculate_llmq_merkle_root();
+        }
+
+        list
+    }
+}

dash/src/sml/masternode_list/mod.rs

@@ -8,9 +8,12 @@ mod peer_addresses;
 mod quorum_helpers;
 mod rotated_quorums_info;
 mod scores_for_quorum;
+mod builder;
 
 use std::collections::BTreeMap;
 
+pub use builder::MasternodeListBuilder;
+
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 
@@ -34,47 +37,3 @@ pub struct MasternodeList {
     pub masternodes: BTreeMap<ProTxHash, QualifiedMasternodeListEntry>,
     pub quorums: BTreeMap<LLMQType, BTreeMap<QuorumHash, QualifiedQuorumEntry>>,
 }
-
-impl MasternodeList {
-    pub fn empty(block_hash: BlockHash, block_height: u32, quorums_active: bool) -> Self {
-        Self::new(BTreeMap::default(), BTreeMap::new(), block_hash, block_height, quorums_active)
-    }
-    pub fn new(
-        masternodes: BTreeMap<ProTxHash, QualifiedMasternodeListEntry>,
-        quorums: BTreeMap<LLMQType, BTreeMap<QuorumHash, QualifiedQuorumEntry>>,
-        block_hash: BlockHash,
-        block_height: u32,
-        quorums_active: bool,
-    ) -> Self {
-        let mut list = Self {
-            quorums,
-            block_hash,
-            known_height: block_height,
-            masternode_merkle_root: None,
-            llmq_merkle_root: None,
-            masternodes,
-        };
-        list.masternode_merkle_root = list.calculate_masternodes_merkle_root(block_height);
-        if quorums_active {
-            list.llmq_merkle_root = list.calculate_llmq_merkle_root();
-        }
-        list
-    }
-    pub fn with_merkle_roots(
-        masternodes: BTreeMap<ProTxHash, QualifiedMasternodeListEntry>,
-        quorums: BTreeMap<LLMQType, BTreeMap<QuorumHash, QualifiedQuorumEntry>>,
-        block_hash: BlockHash,
-        block_height: u32,
-        masternode_merkle_root: MerkleRootMasternodeList,
-        llmq_merkle_root: Option<MerkleRootQuorums>,
-    ) -> Self {
-        Self {
-            quorums,
-            block_hash,
-            known_height: block_height,
-            masternode_merkle_root: Some(masternode_merkle_root),
-            llmq_merkle_root,
-            masternodes,
-        }
-    }
-}