clean up

Author: QuantumExplorer

dash/src/blockdata/transaction/special_transaction/provider_registration.rs

@@ -34,11 +34,12 @@
 //! KeyIdVoting (renamed to voting_key_hash): This is the public key ID used for proposal voting.
 //! Votes signed with this key are valid while the masternode is in the registered set.
 
+use std::net::SocketAddr;
+
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 use hashes::Hash;
 use internals::hex::Case::Lower;
-use std::net::SocketAddr;
 
 use crate::address::Payload;
 use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
@@ -257,9 +258,10 @@ impl Decodable for ProviderRegistrationPayload {
 
 #[cfg(test)]
 mod tests {
+    use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
+
     use hashes::Hash;
     use hashes::hex::FromHex;
-    use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 
     use crate::bls_sig_utils::BLSPublicKey;
     use crate::consensus::{Encodable, deserialize};
@@ -272,10 +274,11 @@ mod tests {
 
     #[cfg(feature = "signer")]
     mod signer {
+        use internals::hex::display::DisplayHex;
+
         use super::*;
         use crate::Network;
         use crate::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
-        use internals::hex::display::DisplayHex;
 
         #[test]
         fn test_collateral_provider_registration_transaction() {

dash/src/network/message_sml.rs

@@ -64,7 +64,21 @@ pub struct MnListDiff {
     pub quorums_chainlock_signatures: Vec<QuorumCLSigObject>,
 }
 
-impl_consensus_encoding!(MnListDiff, version, base_block_hash, block_hash, total_transactions, merkle_hashes, merkle_flags, coinbase_tx, deleted_masternodes, new_masternodes, deleted_quorums, new_quorums, quorums_chainlock_signatures);
+impl_consensus_encoding!(
+    MnListDiff,
+    version,
+    base_block_hash,
+    block_hash,
+    total_transactions,
+    merkle_hashes,
+    merkle_flags,
+    coinbase_tx,
+    deleted_masternodes,
+    new_masternodes,
+    deleted_quorums,
+    new_quorums,
+    quorums_chainlock_signatures
+);
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]

dash/src/sml/address.rs

@@ -46,9 +46,10 @@ impl Decodable for SocketAddr {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::net::Ipv4Addr;
 
+    use super::*;
+
     #[test]
     fn encode_decode_ipv4() {
         let ip = Ipv4Addr::new(192, 168, 1, 1);

dash/src/sml/llmq_entry_verification.rs

@@ -2,6 +2,7 @@ use core::fmt::{Display, Formatter};
 
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
+
 use crate::BlockHash;
 use crate::prelude::CoreBlockHeight;
 use crate::sml::quorum_validation_error::QuorumValidationError;

dash/src/sml/masternode_list/builder.rs

@@ -1,10 +1,11 @@
+use std::collections::BTreeMap;
+
 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;
 use crate::{BlockHash, ProTxHash, QuorumHash};
-use std::collections::BTreeMap;
 
 pub struct MasternodeListBuilder {
     pub block_hash: BlockHash,

dash/src/sml/masternode_list/masternode_helpers.rs

@@ -1,4 +1,5 @@
 use std::net::IpAddr;
+
 use crate::ProTxHash;
 use crate::sml::masternode_list::MasternodeList;
 

dash/src/sml/masternode_list/mod.rs

@@ -12,10 +12,9 @@ mod scores_for_quorum;
 
 use std::collections::BTreeMap;
 
-pub use builder::MasternodeListBuilder;
-
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
+pub use builder::MasternodeListBuilder;
 
 use crate::hash_types::{MerkleRootMasternodeList, MerkleRootQuorums};
 use crate::sml::llmq_type::LLMQType;

dash/src/sml/masternode_list_engine/message_request_verification.rs

@@ -11,7 +11,7 @@ impl MasternodeListEngine {
     fn is_lock_potential_quorums(
         &self,
         instant_lock: &InstantLock,
-    ) -> Result<(&Vec<QualifiedQuorumEntry>), MessageVerificationError> {
+    ) -> Result<&Vec<QualifiedQuorumEntry>, MessageVerificationError> {
         // Retrieve the cycle hash from the Instant Lock
         let cycle_hash = instant_lock.cyclehash;
 

dash/src/sml/masternode_list_engine/mod.rs

@@ -923,7 +923,7 @@ mod tests {
         let block_hex =
             include_str!("../../../tests/data/test_DML_diffs/masternode_list_engine.hex");
         let data = hex::decode(block_hex).expect("decode hex");
-        let mut mn_list_engine: MasternodeListEngine =
+        let mn_list_engine: MasternodeListEngine =
             bincode::decode_from_slice(&data, bincode::config::standard())
                 .expect("expected to decode")
                 .0;
@@ -943,7 +943,7 @@ mod tests {
         let block_hex =
             include_str!("../../../tests/data/test_DML_diffs/masternode_list_engine.hex");
         let data = hex::decode(block_hex).expect("decode hex");
-        let mut mn_list_engine: MasternodeListEngine =
+        let mn_list_engine: MasternodeListEngine =
             bincode::decode_from_slice(&data, bincode::config::standard())
                 .expect("expected to decode")
                 .0;
@@ -954,19 +954,4 @@ mod tests {
                 .expect("expected to validated quorums");
         }
     }
-
-    // #[test]
-    // fn deserialize_mn_list_engine_and_validate_rotated_quorums() {
-    //     let block_hex = include_str!("../../../tests/data/test_DML_diffs/masternode_list_engine.hex");
-    //     let data = hex::decode(block_hex).expect("decode hex");
-    //     let mut mn_list_engine: MasternodeListEngine = bincode::decode_from_slice(&data, bincode::config::standard()).expect("expected to decode").0;
-    //
-    //     assert_eq!(mn_list_engine.masternode_lists.len(), 27);
-    //
-    //     // height 2227678
-    //
-    //     for quorum in &mn_list_engine.last_commitment_entries {
-    //         mn_list_engine.validate_quorum(quorum).expect("expected to validate quorum");
-    //     }
-    // }
 }

dash/src/sml/masternode_list_entry/hash.rs

@@ -1,4 +1,4 @@
-use hashes::{sha256d, Hash};
+use hashes::{Hash, sha256d};
 
 use crate::consensus::Encodable;
 use crate::sml::masternode_list_entry::MasternodeListEntry;