refactor: remove redundant CLSig and ISLock structs

Author: PastaPastaPasta

dash-spv/src/client/message_handler.rs

@@ -148,14 +148,14 @@ impl<'a> MessageHandler<'a> {
                 // This would need access to transaction processing logic
                 tracing::debug!("Transaction processing not yet implemented in message handler");
             }
-            NetworkMessage::CLSig(clsig) => {
-                tracing::info!("Received ChainLock for block {}", clsig.chain_lock.block_hash);
+            NetworkMessage::CLSig(chain_lock) => {
+                tracing::info!("Received ChainLock for block {}", chain_lock.block_hash);
                 // ChainLock processing would need access to state and validation
                 // This might need to be handled at the client level
                 tracing::debug!("ChainLock processing not yet implemented in message handler");
             }
-            NetworkMessage::ISLock(islock_msg) => {
-                tracing::info!("Received InstantSendLock for tx {}", islock_msg.instant_lock.txid);
+            NetworkMessage::ISLock(instant_lock) => {
+                tracing::info!("Received InstantSendLock for tx {}", instant_lock.txid);
                 // InstantLock processing would need access to validation
                 // This might need to be handled at the client level
                 tracing::debug!("InstantLock processing not yet implemented in message handler");

dash/src/network/message.rs

@@ -32,6 +32,7 @@ use crate::network::{
     message_blockdata, message_bloom, message_compact_blocks, message_filter, message_network,
     message_qrinfo, message_sml,
 };
+use crate::{ChainLock, InstantLock};
 use crate::prelude::*;
 
 /// The maximum number of [super::message_blockdata::Inventory] items in an `inv` message.
@@ -260,8 +261,9 @@ pub enum NetworkMessage {
     /// `qrinfo`
     QRInfo(message_qrinfo::QRInfo),
     /// `clsig`
-    CLSig(message_sml::CLSig),
-    ISLock(message_sml::ISLock),
+    CLSig(ChainLock),
+    /// `isdlock`
+    ISLock(InstantLock),
     /// Any other message.
     Unknown {
         /// The command of this message.

dash/src/network/message_sml.rs

@@ -7,7 +7,7 @@ use crate::internal_macros::impl_consensus_encoding;
 use crate::sml::llmq_type::LLMQType;
 use crate::sml::masternode_list_entry::MasternodeListEntry;
 use crate::transaction::special_transaction::quorum_commitment::QuorumEntry;
-use crate::{BlockHash, ChainLock, InstantLock, ProTxHash, QuorumHash, Transaction};
+use crate::{BlockHash, ProTxHash, QuorumHash, Transaction};
 
 /// The `getmnlistd` message requests a `mnlistdiff` message that provides either:
 /// - A full masternode list (if `base_block_hash` is all-zero)
@@ -99,25 +99,6 @@ pub struct DeletedQuorum {
 
 impl_consensus_encoding!(DeletedQuorum, llmq_type, quorum_hash);
 
-#[derive(PartialEq, Eq, Clone, Debug)]
-#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
-pub struct CLSig {
-    pub chain_lock: ChainLock,
-}
-
-impl_consensus_encoding!(CLSig, chain_lock);
-
-#[derive(PartialEq, Eq, Clone, Debug)]
-#[cfg_attr(feature = "bincode", derive(Encode, Decode))]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
-pub struct ISLock {
-    pub instant_lock: InstantLock,
-}
-
-impl_consensus_encoding!(ISLock, instant_lock);
 
 #[cfg(test)]
 mod tests {