script: add FromHex and FromStr implementations #537
Conversation
src/blockdata/script.rs
Outdated
| ExactSizeIterator + | ||
| DoubleEndedIterator, | ||
| { | ||
| Ok(Script(Vec::from_byte_iter(iter)?.into())) |
There was a problem hiding this comment.
if you wish to skip the ? unrwapping... Vec::from_byte_iter(iter).map(Box<[u8]>::from).map(Script)
There was a problem hiding this comment.
Nice. Yeah, I'll change to do that.
|
cr-ack |
|
tAck 105d8414b6d37e96b1ce93d109cdb13e97d0e668. Idk why CI is failing for 1.29, also there is a unrelated warning while compiling. |
105d841 to
674544d
Compare
|
utACK 674544d |
| @@ -169,7 +169,7 @@ macro_rules! display_from_debug { | |||
| } | |||
|
|
|||
| #[cfg(test)] | |||
| macro_rules! hex_script (($s:expr) => ($crate::blockdata::script::Script::from(<Vec<u8> as $crate::hashes::hex::FromHex>::from_hex($s).unwrap()))); | |||
| macro_rules! hex_script (($s:expr) => (<$crate::Script as ::std::str::FromStr>::from_str($s).unwrap())); | |||
There was a problem hiding this comment.
I was wondering about the reason to have this macro, is it to hide the unwrap?
isn't slightly better to use in test Script::from_hex("0100").unwrap() instead of a macro call that hides the method called and it is usable only internally?
There was a problem hiding this comment.
it doesn't matter because this is for test code only
There was a problem hiding this comment.
The macro used to hide a pile of complicated stuff. Now it only hides the unwrap. At this point you're right that the macro serves little purpose and basically just obfuscates ... but removing it would've made the diff much bigger.
|
No, ASM is unparseable because numbers are encoded in decimal or hex with no indication as to which is which. |
Fixes #523