code quality- Fixing serde clippy warning (#367)

Signed-off-by: Siddhesh Z <[email protected]>
vinteumorg · Feb 5, 2025 · 879e263 · 879e263
1 parent 6a073bc
commit 879e263
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/crates/floresta-wire/src/p2p_wire/peer.rs b/crates/floresta-wire/src/p2p_wire/peer.rs
@@ -50,7 +50,7 @@ const PING_TIMEOUT: u64 = 30;
 /// If the last message we've got was more than XX, send out a ping
 const SEND_PING_TIMEOUT: u64 = 60;
 /// The inv element type for a utreexo block with witness data
-const INV_UTREEXO_BLOCK: u32 = 0x40000002 | 1 << 24;
+const INV_UTREEXO_BLOCK: u32 = 0x40000002 | (1 << 24);
 
 #[derive(Debug, PartialEq)]
 enum State {

diff --git a/crates/floresta-wire/src/p2p_wire/sync_node.rs b/crates/floresta-wire/src/p2p_wire/sync_node.rs
@@ -55,7 +55,6 @@ impl NodeContext for SyncNode {
 
 /// Node methods for a [`UtreexoNode`] where its Context is a [`SyncNode`].
 /// See [node](crates/floresta-wire/src/p2p_wire/node.rs) for more information.
-
 impl<Chain> UtreexoNode<Chain, SyncNode>
 where
     WireError: From<<Chain as BlockchainInterface>::Error>,

diff --git a/florestad/src/slip132.rs b/florestad/src/slip132.rs
@@ -14,6 +14,8 @@ use bitcoin::base58;
 use bitcoin::bip32;
 use bitcoin::bip32::Xpriv;
 use bitcoin::bip32::Xpub;
+use serde::Deserialize;
+use serde::Serialize;
 
 /// Magical version bytes for xpub: bitcoin mainnet public key for P2PKH or P2SH
 pub const VERSION_MAGIC_XPUB: [u8; 4] = [0x04, 0x88, 0xB2, 0x1E];
@@ -147,36 +149,31 @@ pub struct DefaultResolver;
 
 /// SLIP 132-defined key applications defining types of scriptPubkey descriptors
 /// in which they can be used
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate")
-)]
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum KeyApplication {
     /// xprv/xpub: keys that can be used for P2PKH and multisig P2SH
     /// scriptPubkey descriptors.
-    #[cfg_attr(feature = "serde", serde(rename = "bip44"))]
+    #[serde(rename = "bip44")]
     Hashed,
 
     /// zprv/zpub: keys that can be used for P2WPKH scriptPubkey descriptors
-    #[cfg_attr(feature = "serde", serde(rename = "bip84"))]
+    #[serde(rename = "bip84")]
     SegWit,
 
     /// Zprv/Zpub: keys that can be used for multisig P2WSH scriptPubkey
     /// descriptors
-    #[cfg_attr(feature = "serde", serde(rename = "bip48-native"))]
+    #[serde(rename = "bip48-native")]
     SegWitMultisig,
 
     /// yprv/ypub: keys that can be used for P2WPKH-in-P2SH scriptPubkey
     /// descriptors
-    #[cfg_attr(feature = "serde", serde(rename = "bip49"))]
+    #[serde(rename = "bip49")]
     Nested,
 
     /// Yprv/Ypub: keys that can be used for multisig P2WSH-in-P2SH
     /// scriptPubkey descriptors
-    #[cfg_attr(feature = "serde", serde(rename = "bip48-nested"))]
+    #[serde(rename = "bip48-nested")]
     NestedMultisig,
 }