Skip to content

Commit

Permalink
Merge #745: Improved PublicKey and XOnlyPublicKey Debug impl
Browse files Browse the repository at this point in the history
ca32f7b improved PublicKey debug impl (Liam Aharon)

Pull request description:

  Closes #729

  Adjusts `Debug` impls to write serialized hex representation of the keys rather than the inner u8 bytes.

ACKs for top commit:
  apoelstra:
    ACK ca32f7b successfully ran local tests
  tcharding:
    ACK ca32f7b

Tree-SHA512: e73c10733fe3b493492c16f6b2e68149339395b882c70d2d80b9b5e0d75ec671155b09a101ca019e44260413ecb82e93919f2caf0d2508b5baa641e839689909
  • Loading branch information
apoelstra committed Sep 17, 2024
2 parents 2a80731 + ca32f7b commit 736adc9
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl str::FromStr for SecretKey {
/// ```
/// [`bincode`]: https://docs.rs/bincode
/// [`cbor`]: https://docs.rs/cbor
#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
#[repr(transparent)]
pub struct PublicKey(ffi::PublicKey);
impl_fast_comparisons!(PublicKey);
Expand All @@ -163,6 +163,10 @@ impl fmt::Display for PublicKey {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::LowerHex::fmt(self, f) }
}

impl fmt::Debug for PublicKey {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::LowerHex::fmt(self, f) }
}

impl str::FromStr for PublicKey {
type Err = Error;
fn from_str(s: &str) -> Result<PublicKey, Error> {
Expand Down Expand Up @@ -1138,7 +1142,7 @@ impl CPtr for Keypair {
/// ```
/// [`bincode`]: https://docs.rs/bincode
/// [`cbor`]: https://docs.rs/cbor
#[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
pub struct XOnlyPublicKey(ffi::XOnlyPublicKey);
impl_fast_comparisons!(XOnlyPublicKey);

Expand All @@ -1156,6 +1160,10 @@ impl fmt::Display for XOnlyPublicKey {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::LowerHex::fmt(self, f) }
}

impl fmt::Debug for XOnlyPublicKey {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::LowerHex::fmt(self, f) }
}

impl str::FromStr for XOnlyPublicKey {
type Err = Error;
fn from_str(s: &str) -> Result<XOnlyPublicKey, Error> {
Expand Down

0 comments on commit 736adc9

Please sign in to comment.