Skip to content

Commit

Permalink
Merge #2620: bitcoin: Depend on and export hex-conservative
Browse files Browse the repository at this point in the history
8273b80 bitcoin: Depend on and export hex-conservative (Tobin C. Harding)

Pull request description:

  When we did the `rust-bitcoin v0.30.0` release we had not yet released the `hex-conservative` crate so we forced users to reach into `bitcoin-internals` to get at hex stuff e.g., `DisplayHex`.

  To ease the upgrade path for any remaining upgraders add a dependency on the now released `hex-conservative` crate and re-export it from the crate root as `hex` (bit late I know, sorry).

  Idea came from: #2482 (comment)

  We should have done this soon as we released `hex-conservative`.

ACKs for top commit:
  apoelstra:
    utACK 8273b80 -- tested `cargo test` at least

Tree-SHA512: 6c2cd137f9e5d00fb2ecfb35ce368b4555ece81a360e02770090870dd79f8fa8cf22f600399a9311bddeb433e752d387bef1dd5721cf0823bced5895e17e662e
  • Loading branch information
apoelstra committed May 4, 2024
2 parents 4b6b55f + 8273b80 commit e376e90
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions bitcoin/Cargo.toml
Expand Up @@ -38,6 +38,7 @@ bitcoin-internals = { path = "../internals", package = "bitcoin-private", versio
bech32 = { version = "0.9.0", default-features = false }
bitcoin_hashes = { version = "0.12.0", default-features = false }
secp256k1 = { version = "0.27.0", default-features = false, features = ["bitcoin_hashes"] }
hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] }
hex_lit = "0.1.1"

base64 = { version = "0.13.0", optional = true }
Expand Down
1 change: 1 addition & 0 deletions bitcoin/src/lib.rs
Expand Up @@ -64,6 +64,7 @@ pub extern crate bitcoin_hashes as hashes;
#[cfg(feature = "bitcoinconsensus")]
#[cfg_attr(docsrs, doc(cfg(feature = "bitcoinconsensus")))]
pub extern crate bitcoinconsensus;
pub extern crate hex;
pub extern crate secp256k1;

#[cfg(feature = "serde")]
Expand Down

0 comments on commit e376e90

Please sign in to comment.