From 83e76d78b721bf632e379b9a40840330b6b28e35 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 15 Dec 2023 18:14:56 +0000 Subject: [PATCH] Drop explicit `bitcoin_hashes` dependency in `lightning-invoice` Since `lightning-invoice` now depends on the `bitcoin` crate directly, also depending on the `bitcoin_hashes` crate is redundant and just means we confuse users by setting the `std` flag only on `bitcoin`. Thus, we drop the explicit dependency here and replace it with `bitcoin::hashes`. --- lightning-invoice/Cargo.toml | 3 +-- lightning-invoice/src/de.rs | 12 ++++++------ lightning-invoice/src/lib.rs | 11 +++++------ lightning-invoice/src/payment.rs | 4 ++-- lightning-invoice/src/utils.rs | 6 +++--- lightning-invoice/tests/ser_de.rs | 3 +-- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lightning-invoice/Cargo.toml b/lightning-invoice/Cargo.toml index 5377b7ef..a06cbee7 100644 --- a/lightning-invoice/Cargo.toml +++ b/lightning-invoice/Cargo.toml @@ -17,14 +17,13 @@ rustdoc-args = ["--cfg", "docsrs"] [features] default = ["std"] no-std = ["hashbrown", "lightning/no-std"] -std = ["bitcoin_hashes/std", "num-traits/std", "lightning/std", "bech32/std"] +std = ["bitcoin/std", "num-traits/std", "lightning/std", "bech32/std"] [dependencies] bech32 = { version = "0.9.0", default-features = false } lightning = { version = "0.0.118", path = "../lightning", default-features = false } secp256k1 = { version = "0.27.0", default-features = false, features = ["recovery", "alloc"] } num-traits = { version = "0.2.8", default-features = false } -bitcoin_hashes = { version = "0.12.0", default-features = false } hashbrown = { version = "0.8", optional = true } serde = { version = "1.0.118", optional = true } bitcoin = { version = "0.30.2", default-features = false } diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs index 0276b742..c75373ea 100644 --- a/lightning-invoice/src/de.rs +++ b/lightning-invoice/src/de.rs @@ -11,8 +11,8 @@ use bech32::{u5, FromBase32}; use bitcoin::{PubkeyHash, ScriptHash}; use bitcoin::address::WitnessVersion; -use bitcoin_hashes::Hash; -use bitcoin_hashes::sha256; +use bitcoin::hashes::Hash; +use bitcoin::hashes::sha256; use crate::prelude::*; use lightning::ln::PaymentSecret; use lightning::routing::gossip::RoutingFees; @@ -564,14 +564,14 @@ impl FromBase32 for Fallback { 17 => { let pkh = match PubkeyHash::from_slice(&bytes) { Ok(pkh) => pkh, - Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidPubKeyHashLength), + Err(bitcoin::hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidPubKeyHashLength), }; Ok(Fallback::PubKeyHash(pkh)) } 18 => { let sh = match ScriptHash::from_slice(&bytes) { Ok(sh) => sh, - Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidScriptHashLength), + Err(bitcoin::hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidScriptHashLength), }; Ok(Fallback::ScriptHash(sh)) } @@ -726,7 +726,7 @@ mod test { use crate::de::Bolt11ParseError; use secp256k1::PublicKey; use bech32::u5; - use bitcoin_hashes::sha256; + use bitcoin::hashes::sha256; use std::str::FromStr; const CHARSET_REV: [i8; 128] = [ @@ -856,7 +856,7 @@ mod test { use bech32::FromBase32; use bitcoin::{PubkeyHash, ScriptHash}; use bitcoin::address::WitnessVersion; - use bitcoin_hashes::Hash; + use bitcoin::hashes::Hash; let cases = vec![ ( diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs index c2e1ecf2..690bf576 100644 --- a/lightning-invoice/src/lib.rs +++ b/lightning-invoice/src/lib.rs @@ -30,7 +30,6 @@ pub mod payment; pub mod utils; extern crate bech32; -extern crate bitcoin_hashes; #[macro_use] extern crate lightning; extern crate num_traits; extern crate secp256k1; @@ -46,7 +45,7 @@ use std::time::SystemTime; use bech32::u5; use bitcoin::{Address, Network, PubkeyHash, ScriptHash}; use bitcoin::address::{Payload, WitnessProgram, WitnessVersion}; -use bitcoin_hashes::{Hash, sha256}; +use bitcoin::hashes::{Hash, sha256}; use lightning::ln::features::Bolt11InvoiceFeatures; use lightning::util::invoice::construct_invoice_preimage; @@ -166,10 +165,10 @@ pub const DEFAULT_MIN_FINAL_CLTV_EXPIRY_DELTA: u64 = 18; /// extern crate secp256k1; /// extern crate lightning; /// extern crate lightning_invoice; -/// extern crate bitcoin_hashes; +/// extern crate bitcoin; /// -/// use bitcoin_hashes::Hash; -/// use bitcoin_hashes::sha256; +/// use bitcoin::hashes::Hash; +/// use bitcoin::hashes::sha256; /// /// use secp256k1::Secp256k1; /// use secp256k1::SecretKey; @@ -1756,7 +1755,7 @@ impl<'de> Deserialize<'de> for Bolt11Invoice { #[cfg(test)] mod test { use bitcoin::ScriptBuf; - use bitcoin_hashes::sha256; + use bitcoin::hashes::sha256; use std::str::FromStr; #[test] diff --git a/lightning-invoice/src/payment.rs b/lightning-invoice/src/payment.rs index 7306d12f..b8f564ef 100644 --- a/lightning-invoice/src/payment.rs +++ b/lightning-invoice/src/payment.rs @@ -10,7 +10,7 @@ //! Convenient utilities for paying Lightning invoices. use crate::Bolt11Invoice; -use crate::bitcoin_hashes::Hash; +use bitcoin::hashes::Hash; use lightning::ln::PaymentHash; use lightning::ln::channelmanager::RecipientOnionFields; @@ -84,7 +84,7 @@ fn params_from_invoice(invoice: &Bolt11Invoice, amount_msat: u64) mod tests { use super::*; use crate::{InvoiceBuilder, Currency}; - use bitcoin_hashes::sha256::Hash as Sha256; + use bitcoin::hashes::sha256::Hash as Sha256; use lightning::events::Event; use lightning::ln::channelmanager::{Retry, PaymentId}; use lightning::ln::msgs::ChannelMessageHandler; diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs index 1248221a..3a337a9a 100644 --- a/lightning-invoice/src/utils.rs +++ b/lightning-invoice/src/utils.rs @@ -4,7 +4,7 @@ use crate::{Bolt11Invoice, CreationError, Currency, InvoiceBuilder, SignOrCreati use crate::{prelude::*, Description, Bolt11InvoiceDescription, Sha256}; use bech32::ToBase32; -use bitcoin_hashes::Hash; +use bitcoin::hashes::Hash; use lightning::chain; use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator}; use lightning::sign::{Recipient, NodeSigner, SignerProvider, EntropySource}; @@ -819,8 +819,8 @@ mod test { use core::cell::RefCell; use core::time::Duration; use crate::{Currency, Description, Bolt11InvoiceDescription, SignOrCreationError, CreationError}; - use bitcoin_hashes::{Hash, sha256}; - use bitcoin_hashes::sha256::Hash as Sha256; + use bitcoin::hashes::{Hash, sha256}; + use bitcoin::hashes::sha256::Hash as Sha256; use lightning::sign::PhantomKeysManager; use lightning::events::{MessageSendEvent, MessageSendEventsProvider, Event, EventsProvider}; use lightning::ln::{PaymentPreimage, PaymentHash}; diff --git a/lightning-invoice/tests/ser_de.rs b/lightning-invoice/tests/ser_de.rs index 98886bef..92bc87be 100644 --- a/lightning-invoice/tests/ser_de.rs +++ b/lightning-invoice/tests/ser_de.rs @@ -1,5 +1,4 @@ extern crate bech32; -extern crate bitcoin_hashes; extern crate lightning; extern crate lightning_invoice; extern crate secp256k1; @@ -8,7 +7,7 @@ extern crate hex; use bitcoin::address::WitnessVersion; use bitcoin::{PubkeyHash, ScriptHash}; use bitcoin::hashes::hex::FromHex; -use bitcoin_hashes::{sha256, Hash}; +use bitcoin::hashes::{sha256, Hash}; use lightning::ln::PaymentSecret; use lightning::routing::gossip::RoutingFees; use lightning::routing::router::{RouteHint, RouteHintHop}; -- 2.30.2