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

Merge rust-bitcoin/rust-bitcoin#1646: Remove FromStr impl from ScriptBuf 

a819cf99d6 Remove FromStr impl from ScriptBuf (Tobin C. Harding)

Pull request description:

  `FromStr` impls should roundtrip with `Display` imlps but currently our `ScriptBuf` displays using instructions but parses hex.

  Looks like this slipped back in during a recent rebase fail by me.

ACKs for top commit:
  apoelstra:
    ACK a819cf99d6
  Kixunil:
    ACK a819cf99d6

Tree-SHA512: 754f87147a1cffccea8b4016a4fe204b34e85a983dd89e4c3c2a73c694420f87fda6bea5b7a298a84e95a0e9b6942841fb5cdef0c12662b64819c79cfe5d96f9
This commit is contained in:
Andrew Poelstra 2023-02-14 14:29:51 +00:00
parent 5fed454949 a819cf99d6
commit 0a83f1279b
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitcoin/src/blockdata/script/mod.rs
View File

@ -62,7 +62,6 @@ use serde;
use crate::blockdata::opcodes::{self, all::*}; use crate::blockdata::opcodes::{self, all::*};
use crate::consensus::{encode, Decodable, Encodable}; use crate::consensus::{encode, Decodable, Encodable};
use crate::hash_types::{ScriptHash, WScriptHash}; use crate::hash_types::{ScriptHash, WScriptHash};
use crate::hashes::hex;
use crate::{io, OutPoint}; use crate::{io, OutPoint};
use crate::prelude::*; use crate::prelude::*;
@ -344,14 +343,6 @@ impl From<&Script> for WScriptHash {
} }
} }
impl core::str::FromStr for ScriptBuf {
type Err = hex::Error;
#[inline]
fn from_str(s: &str) -> Result<Self, hex::Error> {
ScriptBuf::from_hex(s)
}
}
impl AsRef<Script> for Script { impl AsRef<Script> for Script {
#[inline] #[inline]
fn as_ref(&self) -> &Script { fn as_ref(&self) -> &Script {