milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Delegate debug for ScriptBuf to Script 

Currently the derived implementation of `Debug` for `ScriptBuf` prints
the inner vector of u8s as integers, this is ugly and hard to read. The
`Script` implementation of `Debug` prints the script opcodes and data as
hex, we can just delegate to it.

With this applied we get debug output of form:

    Script(OP_DUP OP_HASH160 OP_PUSHBYTES_20 \
    3bde42dbee7e4dbe6a21b2d50ce2f0167faa8159 OP_EQUALVERIFY OP_CHECKSIG)

Fix: #1516
This commit is contained in:
Tobin C. Harding 2023-01-23 12:47:16 +11:00
parent d66ee48482
commit 8c0e5213d3
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitcoin/src/blockdata/script.rs
View File

@ -137,7 +137,7 @@ pub struct Script([u8]);
/// that all the safety/validity restrictions that apply to [`Script`] apply to `ScriptBuf` as well. /// that all the safety/validity restrictions that apply to [`Script`] apply to `ScriptBuf` as well.
/// ///
/// [deref coercions]: https://doc.rust-lang.org/std/ops/trait.Deref.html#more-on-deref-coercion /// [deref coercions]: https://doc.rust-lang.org/std/ops/trait.Deref.html#more-on-deref-coercion
#[derive(Default, Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)] #[derive(Default, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
pub struct ScriptBuf(Vec<u8>); pub struct ScriptBuf(Vec<u8>);
impl ToOwned for Script { impl ToOwned for Script {
@ -1315,6 +1315,12 @@ impl ScriptBuf {
} }
} }
impl fmt::Debug for ScriptBuf {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(self.as_script(), f)
}
}
impl Deref for ScriptBuf { impl Deref for ScriptBuf {
type Target = Script; type Target = Script;