Skip to content
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

Jump to bottom

Feature gate the Keypair::FromStr impl #728

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Feature gate the Keypair::FromStr impl #728

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
17 changes: 2 additions & 15 deletions src/key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,7 @@ impl<'a> From<&'a Keypair> for PublicKey {
fn from(pair: &'a Keypair) -> Self { PublicKey::from_keypair(pair) }
}

#[cfg(any(feature = "global-context", feature = "alloc"))]
impl str::FromStr for Keypair {
type Err = Error;

Expand All @@ -1011,9 +1012,6 @@ impl str::FromStr for Keypair {
#[cfg(all(not(feature = "global-context"), feature = "alloc"))]
let ctx = Secp256k1::signing_only();

#[cfg(not(any(feature = "global-context", feature = "alloc")))]
let ctx: Secp256k1<crate::SignOnlyPreallocated> = panic!("The previous implementation was panicking too, please enable the global-context feature of rust-secp256k1");

#[allow(clippy::needless_borrow)]
Keypair::from_seckey_str(&ctx, s)
}
Expand All @@ -1040,7 +1038,7 @@ impl serde::Serialize for Keypair {

#[cfg(feature = "serde")]
#[allow(unused_variables)] // For `data` under some feature combinations (the unconditional panic below).
#[allow(unreachable_code)] // For `Keypair::from_seckey_slice` after unconditional panic.
#[cfg(all(feature = "serde", any(feature = "global-context", feature = "alloc")))]
impl<'de> serde::Deserialize<'de> for Keypair {
fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
if d.is_human_readable() {
Expand All @@ -1055,9 +1053,6 @@ impl<'de> serde::Deserialize<'de> for Keypair {
#[cfg(all(not(feature = "global-context"), feature = "alloc"))]
let ctx = Secp256k1::signing_only();

#[cfg(not(any(feature = "global-context", feature = "alloc")))]
let ctx: Secp256k1<crate::SignOnlyPreallocated> = panic!("cannot deserialize key pair without a context (please enable either the global-context or alloc feature)");

#[allow(clippy::needless_borrow)]
Keypair::from_seckey_slice(&ctx, data)
});
Expand Down Expand Up @@ -2423,14 +2418,6 @@ mod test {
.collect::<Vec<_>>();
serde_test::assert_tokens(&keypair.compact(), &tokens);
}

#[test]
#[should_panic(expected = "The previous implementation was panicking too")]
#[cfg(not(any(feature = "alloc", feature = "global-context")))]
fn test_parse_keypair_no_alloc_panic() {
let key_hex = "4242424242424242424242424242424242424242424242424242424242424242";
let _: Keypair = key_hex.parse().expect("We shouldn't even get this far");
}
}

#[cfg(bench)]
Expand Down
Loading