diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index d2e0bfb9..50c83054 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -2448,6 +2448,29 @@ mod tests { let seq = Sequence::from_seconds_floor(1000); println!("{:?}", seq) } + + #[test] + fn outpoint_format() { + let outpoint = OutPoint::default(); + + let debug = "OutPoint { txid: 0000000000000000000000000000000000000000000000000000000000000000, vout: 4294967295 }"; + assert_eq!(debug, format!("{:?}", &outpoint)); + + let display = "0000000000000000000000000000000000000000000000000000000000000000:4294967295"; + assert_eq!(display, format!("{}", &outpoint)); + + let pretty_debug = "OutPoint {\n txid: 0000000000000000000000000000000000000000000000000000000000000000,\n vout: 4294967295,\n}"; + assert_eq!(pretty_debug, format!("{:#?}", &outpoint)); + + let debug_txid = "0000000000000000000000000000000000000000000000000000000000000000"; + assert_eq!(debug_txid, format!("{:?}", &outpoint.txid)); + + let display_txid = "0000000000000000000000000000000000000000000000000000000000000000"; + assert_eq!(display_txid, format!("{}", &outpoint.txid)); + + let pretty_txid = "0x0000000000000000000000000000000000000000000000000000000000000000"; + assert_eq!(pretty_txid, format!("{:#}", &outpoint.txid)); + } } #[cfg(bench)] diff --git a/hashes/src/util.rs b/hashes/src/util.rs index c84b928a..79ac4d05 100644 --- a/hashes/src/util.rs +++ b/hashes/src/util.rs @@ -39,7 +39,7 @@ macro_rules! hex_fmt_impl( impl<$($gen: $gent),*> $crate::_export::_core::fmt::Debug for $ty<$($gen),*> { #[inline] fn fmt(&self, f: &mut $crate::_export::_core::fmt::Formatter) -> $crate::_export::_core::fmt::Result { - write!(f, "{:#}", self) + write!(f, "{}", self) } } );