chore: update from serde_crate to dep:serde

BP-WG · Dec 22, 2024 · b59221a · b59221a
1 parent 951fa19
commit b59221a
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 336 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,7 @@ bp-consensus = { version = "0.12.0-beta.2", path = "./consensus" }
 bp-dbc = { version = "0.12.0-beta.2", path = "./dbc" }
 bp-seals = { version = "0.12.0-beta.2", path = "./seals" }
 secp256k1 = { version = "0.30.0", features = ["global-context", "rand"] }
-serde_crate = { package = "serde", version = "1", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
 
 [package]
 name = "bp-core"
@@ -65,14 +65,14 @@ single_use_seals = { workspace = true }
 bp-consensus = { workspace = true }
 bp-dbc = { workspace = true }
 bp-seals = { workspace = true }
-serde_crate = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
 
 [features]
 default = []
 all = ["chrono", "serde", "stl"]
 chrono = ["bp-consensus/chrono"]
 serde = [
-    "serde_crate",
+    "dep:serde",
     "bp-consensus/serde",
     "bp-dbc/serde",
     "bp-seals/serde",

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -21,15 +21,15 @@ strict_encoding = { workspace = true }
 strict_types = { workspace = true, optional = true }
 commit_verify = { workspace = true }
 secp256k1 = { workspace = true }
-serde_crate = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
 chrono = { version = "0.4.38", optional = true }
 
 [features]
 default = ["chrono"]
 all = ["chrono", "stl", "serde"]
 stl = ["strict_types"]
 serde = [
-    "serde_crate",
+    "dep:serde",
     "amplify/serde",
     "secp256k1/serde"
 ]

diff --git a/consensus/src/block.rs b/consensus/src/block.rs
@@ -32,11 +32,7 @@ use crate::{BlockDataParseError, ConsensusDecode, ConsensusEncode, LIB_NAME_BITC
 #[derive(Wrapper, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, From)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 #[wrapper(BorrowSlice, Index, RangeOps, Debug, Hex, Display, FromStr)]
 pub struct BlockHash(
     #[from]
@@ -47,11 +43,7 @@ pub struct BlockHash(
 #[derive(Wrapper, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, From)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 #[wrapper(BorrowSlice, Index, RangeOps, Debug, Hex, Display, FromStr)]
 pub struct BlockMerkleRoot(
     #[from]
@@ -63,11 +55,7 @@ pub struct BlockMerkleRoot(
 #[display(LowerHex)]
 #[derive(StrictType, StrictEncode, StrictDecode, StrictDumb)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", rename_all = "camelCase")
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(rename_all = "camelCase"))]
 pub struct BlockHeader {
     /// Block version, now repurposed for soft fork signalling.
     pub version: i32,

diff --git a/consensus/src/coding.rs b/consensus/src/coding.rs
@@ -124,8 +124,8 @@ impl ByteStr {
 #[cfg(feature = "serde")]
 mod _serde {
     use amplify::hex::{FromHex, ToHex};
-    use serde_crate::de::Error;
-    use serde_crate::{Deserialize, Deserializer, Serialize, Serializer};
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     use super::*;
 

diff --git a/consensus/src/hashtypes.rs b/consensus/src/hashtypes.rs
@@ -30,11 +30,7 @@ use crate::{
 #[wrapper(Index, RangeOps, AsSlice, BorrowSlice, Hex, Display, FromStr)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct PubkeyHash(
     #[from]
     #[from([u8; 20])]
@@ -79,11 +75,7 @@ impl From<LegacyPk> for PubkeyHash {
 #[wrapper(Index, RangeOps, AsSlice, BorrowSlice, Hex, Display, FromStr)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct ScriptHash(
     #[from]
     #[from([u8; 20])]
@@ -108,11 +100,7 @@ impl From<&RedeemScript> for ScriptHash {
 #[wrapper(Index, RangeOps, AsSlice, BorrowSlice, Hex, Display, FromStr)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct WPubkeyHash(
     #[from]
     #[from([u8; 20])]
@@ -137,11 +125,7 @@ impl From<CompressedPk> for WPubkeyHash {
 #[wrapper(Index, RangeOps, AsSlice, BorrowSlice, Hex, Display, FromStr)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct WScriptHash(
     #[from]
     #[from([u8; 32])]

diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs
@@ -44,7 +44,7 @@ extern crate strict_encoding;
 extern crate commit_verify;
 #[cfg(feature = "serde")]
 #[macro_use]
-extern crate serde_crate as serde;
+extern crate serde;
 
 extern crate core;
 /// Re-export of `secp256k1` crate.

diff --git a/consensus/src/pubkeys.rs b/consensus/src/pubkeys.rs
@@ -57,11 +57,7 @@ pub enum InvalidPubkey<const LEN: usize> {
 #[wrapper_mut(DerefMut)]
 #[derive(StrictType, StrictDumb)]
 #[strict_type(lib = LIB_NAME_BITCOIN, dumb = Self::dumb())]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct CompressedPk(PublicKey);
 
 impl CompressedPk {
@@ -110,11 +106,7 @@ impl FromStr for CompressedPk {
 #[wrapper_mut(DerefMut)]
 #[derive(StrictType, StrictDumb)]
 #[strict_type(lib = LIB_NAME_BITCOIN, dumb = Self::dumb())]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct UncompressedPk(PublicKey);
 
 impl UncompressedPk {
@@ -159,7 +151,7 @@ impl FromStr for UncompressedPk {
 #[wrapper_mut(DerefMut)]
 #[derive(StrictType, StrictDumb)]
 #[strict_type(lib = LIB_NAME_BITCOIN, dumb = Self::dumb())]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate = "serde_crate"))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct LegacyPk {
     pub compressed: bool,
     #[wrap]

diff --git a/consensus/src/script.rs b/consensus/src/script.rs
@@ -30,11 +30,7 @@ use crate::{ScriptHash, VarInt, VarIntBytes, WitnessVer, LIB_NAME_BITCOIN};
 #[wrapper_mut(DerefMut, AsSliceMut)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct SigScript(ScriptBytes);
 
 impl TryFrom<Vec<u8>> for SigScript {
@@ -72,11 +68,7 @@ impl SigScript {
 #[wrapper_mut(DerefMut, AsSliceMut)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct ScriptPubkey(ScriptBytes);
 
 impl TryFrom<Vec<u8>> for ScriptPubkey {
@@ -163,11 +155,7 @@ impl ScriptPubkey {
 #[wrapper_mut(DerefMut, AsSliceMut)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct RedeemScript(ScriptBytes);
 
 impl TryFrom<Vec<u8>> for RedeemScript {
@@ -312,9 +300,8 @@ impl ScriptBytes {
 #[cfg(feature = "serde")]
 mod _serde {
     use amplify::hex::{FromHex, ToHex};
-    use serde::{Deserialize, Serialize};
-    use serde_crate::de::Error;
-    use serde_crate::{Deserializer, Serializer};
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     use super::*;
 

diff --git a/consensus/src/segwit.rs b/consensus/src/segwit.rs
@@ -308,11 +308,7 @@ impl ScriptPubkey {
 #[wrapper_mut(DerefMut, AsSliceMut)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct WitnessScript(ScriptBytes);
 
 impl TryFrom<Vec<u8>> for WitnessScript {
@@ -357,11 +353,7 @@ impl WitnessScript {
 #[wrapper(BorrowSlice, Index, RangeOps, Debug, Hex, Display, FromStr)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct Wtxid(
     #[from]
     #[from([u8; 32])]
@@ -403,9 +395,8 @@ impl Witness {
 
 #[cfg(feature = "serde")]
 mod _serde {
-    use serde::{Deserialize, Serialize};
-    use serde_crate::ser::SerializeSeq;
-    use serde_crate::{Deserializer, Serializer};
+    use serde::ser::SerializeSeq;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     use super::*;
 

diff --git a/consensus/src/sigtypes.rs b/consensus/src/sigtypes.rs
@@ -31,11 +31,7 @@ use crate::{NonStandardValue, ScriptBytes, ScriptPubkey, WitnessScript, LIB_NAME
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, Display, Default)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN, tags = repr, into_u8, try_from_u8)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", rename_all = "camelCase")
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(rename_all = "camelCase"))]
 #[display(uppercase)]
 #[repr(u8)]
 pub enum SighashFlag {
@@ -55,11 +51,7 @@ pub enum SighashFlag {
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, Default)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", rename_all = "camelCase")
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(rename_all = "camelCase"))]
 pub struct SighashType {
     pub flag: SighashFlag,
     pub anyone_can_pay: bool,
@@ -200,11 +192,7 @@ impl Display for SighashType {
 #[wrapper(Index, RangeOps, AsSlice, BorrowSlice, Hex, Display, FromStr)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct Sighash(
     #[from]
     #[from([u8; 32])]
@@ -283,11 +271,7 @@ pub enum SigError {
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
 #[derive(StrictType)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", rename_all = "camelCase")
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(rename_all = "camelCase"))]
 pub struct LegacySig {
     /// The underlying ECDSA Signature
     pub sig: ecdsa::Signature,
@@ -329,11 +313,7 @@ impl LegacySig {
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
 #[derive(StrictType)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", rename_all = "camelCase")
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(rename_all = "camelCase"))]
 pub struct Bip340Sig {
     /// The underlying ECDSA Signature
     pub sig: schnorr::Signature,