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

Merge pull request #85 from alekseysidorov/hotfix-network-from-str-err 

Hotfix: replace serde error with the io error.
This commit is contained in:
Tamás Blummer 2018-05-24 16:06:14 +02:00 committed by GitHub
parent 6b1872e697 cf4024beb4
commit ee65534a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/macros.rs
View File

@ -106,12 +106,15 @@ macro_rules! user_enum {
} }
impl ::std::str::FromStr for $name { impl ::std::str::FromStr for $name {
type Err = ::serde::de::value::Error; type Err = ::std::io::Error;
#[inline] #[inline]
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match s { match s {
$($txt => Ok($name::$elem)),*, $($txt => Ok($name::$elem)),*,
_ => Err(::serde::de::Error::syntax(stringify!(s))) _ => Err(::std::io::Error::new(
::std::io::ErrorKind::InvalidInput,
format!("Unknown network (type {})", s),
)),
} }
} }
} }

4
src/network/constants.rs
View File

@ -90,8 +90,8 @@ mod tests {
assert_eq!(Network::Bitcoin.to_string(), "bitcoin"); assert_eq!(Network::Bitcoin.to_string(), "bitcoin");
assert_eq!(Network::Testnet.to_string(), "testnet"); assert_eq!(Network::Testnet.to_string(), "testnet");
assert_eq!("bitcoin".parse(), Ok(Network::Bitcoin)); assert_eq!("bitcoin".parse::<Network>().unwrap(), Network::Bitcoin);
assert_eq!("testnet".parse(), Ok(Network::Testnet)); assert_eq!("testnet".parse::<Network>().unwrap(), Network::Testnet);
assert!("fakenet".parse::<Network>().is_err()); assert!("fakenet".parse::<Network>().is_err());
} }
} }