From: 志宇 Date: Fri, 9 Aug 2024 05:50:18 +0000 (+0000) Subject: refactor(chain): remove crate-renaming X-Git-Tag: v1.0.0-beta.2~17^2 X-Git-Url: http://internal-gitweb-vhost/script/%22https:/struct.EncoderStringWriter.html?a=commitdiff_plain;h=318ce095f2adec9d03077ddf65470ff475547f39;p=bdk refactor(chain): remove crate-renaming --- diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml index 0b0a587a..7261bdfa 100644 --- a/crates/chain/Cargo.toml +++ b/crates/chain/Cargo.toml @@ -14,14 +14,14 @@ readme = "README.md" [dependencies] bitcoin = { version = "0.32.0", default-features = false } -serde_crate = { package = "serde", version = "1", optional = true, features = ["derive", "rc"] } +serde = { version = "1", optional = true, features = ["derive", "rc"] } # Use hashbrown as a feature flag to have HashSet and HashMap from it. hashbrown = { version = "0.9.1", optional = true, features = ["serde"] } miniscript = { version = "12.0.0", optional = true, default-features = false } # Feature dependencies -rusqlite_crate = { package = "rusqlite", version = "0.31.0", features = ["bundled"], optional = true } +rusqlite = { version = "0.31.0", features = ["bundled"], optional = true } serde_json = {version = "1", optional = true } [dev-dependencies] @@ -31,5 +31,5 @@ proptest = "1.2.0" [features] default = ["std", "miniscript"] std = ["bitcoin/std", "miniscript?/std"] -serde = ["serde_crate", "bitcoin/serde", "miniscript?/serde"] -rusqlite = ["std", "rusqlite_crate", "serde", "serde_json"] +serde = ["dep:serde", "bitcoin/serde", "miniscript?/serde"] +rusqlite = ["std", "dep:rusqlite", "serde", "serde_json"] diff --git a/crates/chain/src/balance.rs b/crates/chain/src/balance.rs index 569755a9..2d4dc9db 100644 --- a/crates/chain/src/balance.rs +++ b/crates/chain/src/balance.rs @@ -2,11 +2,7 @@ use bitcoin::Amount; /// Balance, differentiated into various categories. #[derive(Debug, PartialEq, Eq, Clone, Default)] -#[cfg_attr( - feature = "serde", - derive(serde::Deserialize, serde::Serialize), - serde(crate = "serde_crate",) -)] +#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub struct Balance { /// All coinbase outputs not yet matured pub immature: Amount, diff --git a/crates/chain/src/chain_data.rs b/crates/chain/src/chain_data.rs index 92ccdb65..8ce6e31a 100644 --- a/crates/chain/src/chain_data.rs +++ b/crates/chain/src/chain_data.rs @@ -42,11 +42,7 @@ impl ChainPosition { /// Block height and timestamp at which a transaction is confirmed. #[derive(Debug, Clone, PartialEq, Eq, Copy, PartialOrd, Ord, core::hash::Hash)] -#[cfg_attr( - feature = "serde", - derive(serde::Deserialize, serde::Serialize), - serde(crate = "serde_crate") -)] +#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub enum ConfirmationTime { /// The transaction is confirmed Confirmed { @@ -91,11 +87,7 @@ impl From> for ConfirmationTime { /// `BlockId` implements [`Anchor`]. When a transaction is anchored to `BlockId`, the confirmation /// block and anchor block are the same block. #[derive(Debug, Clone, PartialEq, Eq, Copy, PartialOrd, Ord, core::hash::Hash)] -#[cfg_attr( - feature = "serde", - derive(serde::Deserialize, serde::Serialize), - serde(crate = "serde_crate") -)] +#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub struct BlockId { /// The height of the block. pub height: u32, @@ -149,11 +141,7 @@ impl From<(&u32, &BlockHash)> for BlockId { /// /// Refer to [`Anchor`] for more details. #[derive(Debug, Default, Clone, PartialEq, Eq, Copy, PartialOrd, Ord, core::hash::Hash)] -#[cfg_attr( - feature = "serde", - derive(serde::Deserialize, serde::Serialize), - serde(crate = "serde_crate") -)] +#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub struct ConfirmationBlockTime { /// The anchor block. pub block_id: BlockId, diff --git a/crates/chain/src/indexed_tx_graph.rs b/crates/chain/src/indexed_tx_graph.rs index a8048d84..92a08a9e 100644 --- a/crates/chain/src/indexed_tx_graph.rs +++ b/crates/chain/src/indexed_tx_graph.rs @@ -306,13 +306,10 @@ impl AsRef> for IndexedTxGraph { #[cfg_attr( feature = "serde", derive(serde::Deserialize, serde::Serialize), - serde( - crate = "serde_crate", - bound( - deserialize = "A: Ord + serde::Deserialize<'de>, IA: serde::Deserialize<'de>", - serialize = "A: Ord + serde::Serialize, IA: serde::Serialize" - ) - ) + serde(bound( + deserialize = "A: Ord + serde::Deserialize<'de>, IA: serde::Deserialize<'de>", + serialize = "A: Ord + serde::Serialize, IA: serde::Serialize" + )) )] #[must_use] pub struct ChangeSet { diff --git a/crates/chain/src/indexer/keychain_txout.rs b/crates/chain/src/indexer/keychain_txout.rs index c4a13fbe..ce9707c7 100644 --- a/crates/chain/src/indexer/keychain_txout.rs +++ b/crates/chain/src/indexer/keychain_txout.rs @@ -843,11 +843,7 @@ impl std::error::Error for InsertDescriptorError {} /// [`apply_changeset`]: crate::keychain_txout::KeychainTxOutIndex::apply_changeset /// [`merge`]: Self::merge #[derive(Clone, Debug, Default, PartialEq)] -#[cfg_attr( - feature = "serde", - derive(serde::Deserialize, serde::Serialize), - serde(crate = "serde_crate") -)] +#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] #[must_use] pub struct ChangeSet { /// Contains for each descriptor_id the last revealed index of derivation diff --git a/crates/chain/src/lib.rs b/crates/chain/src/lib.rs index 77759676..67e2aea1 100644 --- a/crates/chain/src/lib.rs +++ b/crates/chain/src/lib.rs @@ -63,9 +63,9 @@ pub mod spk_client; #[macro_use] extern crate alloc; #[cfg(feature = "rusqlite")] -pub extern crate rusqlite_crate as rusqlite; +pub extern crate rusqlite; #[cfg(feature = "serde")] -pub extern crate serde_crate as serde; +pub extern crate serde; #[cfg(feature = "std")] #[macro_use] diff --git a/crates/chain/src/local_chain.rs b/crates/chain/src/local_chain.rs index 9fcd7a70..3a822ab0 100644 --- a/crates/chain/src/local_chain.rs +++ b/crates/chain/src/local_chain.rs @@ -631,11 +631,7 @@ impl LocalChain { /// The [`ChangeSet`] represents changes to [`LocalChain`]. #[derive(Debug, Default, Clone, PartialEq)] -#[cfg_attr( - feature = "serde", - derive(serde::Deserialize, serde::Serialize), - serde(crate = "serde_crate") -)] +#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub struct ChangeSet { /// Changes to the [`LocalChain`] blocks. /// diff --git a/crates/chain/src/rusqlite_impl.rs b/crates/chain/src/rusqlite_impl.rs index 0ce919d8..a52c491c 100644 --- a/crates/chain/src/rusqlite_impl.rs +++ b/crates/chain/src/rusqlite_impl.rs @@ -157,7 +157,7 @@ impl ToSql for Impl { } } -impl FromSql for Impl { +impl FromSql for Impl { fn column_result(value: ValueRef<'_>) -> FromSqlResult { serde_json::from_str(value.as_str()?) .map(Impl) @@ -165,7 +165,7 @@ impl FromSql for Impl { } } -impl ToSql for Impl { +impl ToSql for Impl { fn to_sql(&self) -> rusqlite::Result> { serde_json::to_string(&self.0) .map(Into::into) diff --git a/crates/chain/src/tx_graph.rs b/crates/chain/src/tx_graph.rs index 192b122e..0eab9386 100644 --- a/crates/chain/src/tx_graph.rs +++ b/crates/chain/src/tx_graph.rs @@ -1228,13 +1228,10 @@ impl TxGraph { #[cfg_attr( feature = "serde", derive(serde::Deserialize, serde::Serialize), - serde( - crate = "serde_crate", - bound( - deserialize = "A: Ord + serde::Deserialize<'de>", - serialize = "A: Ord + serde::Serialize", - ) - ) + serde(bound( + deserialize = "A: Ord + serde::Deserialize<'de>", + serialize = "A: Ord + serde::Serialize", + )) )] #[must_use] pub struct ChangeSet {