Skip to content

Remove bitcoin-internals dependency #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tcharding merged 1 commit into from
Dec 11, 2025
Merged

Remove bitcoin-internals dependency #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo-minimal.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ dependencies = [
"anyhow",
"bincode",
"bitcoin",
"bitcoin-internals",
"hex-conservative",
"miniscript",
"secp256k1",
Expand Down
1 change: 0 additions & 1 deletion Cargo-recent.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ dependencies = [
"anyhow",
"bincode",
"bitcoin",
"bitcoin-internals",
"hex-conservative",
"miniscript",
"secp256k1",
Expand Down
5 changes: 2 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ rustdoc-args = ["--cfg", "docsrs"]

[features]
default = ["std"]
std = ["bitcoin/std", "bitcoin-internals/std", "miniscript?/std"]
std = ["bitcoin/std", "miniscript?/std"]
rand = ["std", "bitcoin/rand-std"]
serde = ["dep:actual-serde", "bitcoin/serde", "bitcoin-internals/serde"]
serde = ["dep:actual-serde", "bitcoin/serde"]
base64 = ["bitcoin/base64"]
miniscript = ["dep:miniscript", "miniscript?/no-std"]

[dependencies]
bitcoin = { version = "0.32.6", default-features = false }
bitcoin-internals = { version = "0.3.0", features = ["alloc"] }
# Workaround for minimal version resolution bug in bitcoin 0.32.x series.
# bitcoin 0.32.6 depends on hex-conservative 0.2.0, which incorrectly specifies
# arrayvec = "0.7" instead of "0.7.2". Is fixed in hex-conservative 0.2.1.
Expand Down
20 changes: 15 additions & 5 deletions src/v0/bitcoin/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,9 @@ pub enum GetKeyError {
NotSupported,
}

bitcoin_internals::impl_from_infallible!(GetKeyError);
impl From<core::convert::Infallible> for GetKeyError {
fn from(never: core::convert::Infallible) -> Self { match never {} }
}

impl fmt::Display for GetKeyError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Expand Down Expand Up @@ -966,7 +968,9 @@ pub enum SignError {
Unsupported,
}

bitcoin_internals::impl_from_infallible!(SignError);
impl From<core::convert::Infallible> for SignError {
fn from(never: core::convert::Infallible) -> Self { match never {} }
}

impl fmt::Display for SignError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down Expand Up @@ -1055,7 +1059,9 @@ pub enum ExtractTxError {
},
}

bitcoin_internals::impl_from_infallible!(ExtractTxError);
impl From<core::convert::Infallible> for ExtractTxError {
fn from(never: core::convert::Infallible) -> Self { match never {} }
}

impl fmt::Display for ExtractTxError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down Expand Up @@ -1107,7 +1113,9 @@ pub enum IndexOutOfBoundsError {
},
}

bitcoin_internals::impl_from_infallible!(IndexOutOfBoundsError);
impl From<core::convert::Infallible> for IndexOutOfBoundsError {
fn from(never: core::convert::Infallible) -> Self { match never {} }
}

impl fmt::Display for IndexOutOfBoundsError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand Down Expand Up @@ -1160,7 +1168,9 @@ mod display_from_str {
Base64Encoding(bitcoin::base64::DecodeError),
}

bitcoin_internals::impl_from_infallible!(PsbtParseError);
impl From<core::convert::Infallible> for PsbtParseError {
fn from(never: core::convert::Infallible) -> Self { match never {} }
}

impl Display for PsbtParseError {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
Expand Down