feat(ethers-core/Bytes): impl FromStr (#991)

This commit is contained in:
Meet Mangukiya 2022-03-05 23:44:11 +05:30 committed by GitHub
parent 010217c407
commit 88262de9ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 1 deletions

View File

@ -2,8 +2,13 @@ use serde::{
de::{Error, Unexpected}, de::{Error, Unexpected},
Deserialize, Deserializer, Serialize, Serializer, Deserialize, Deserializer, Serialize, Serializer,
}; };
use thiserror::Error;
use std::fmt::{Display, Formatter, LowerHex, Result as FmtResult}; use std::{
clone::Clone,
fmt::{Debug, Display, Formatter, LowerHex, Result as FmtResult},
str::FromStr,
};
/// Wrapper type around Bytes to deserialize/serialize "0x" prefixed ethereum hex strings /// Wrapper type around Bytes to deserialize/serialize "0x" prefixed ethereum hex strings
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, Ord, PartialOrd)] #[derive(Clone, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, Ord, PartialOrd)]
@ -64,6 +69,24 @@ impl<'a, const N: usize> From<&'a [u8; N]> for Bytes {
} }
} }
#[derive(Debug, Clone, Error)]
#[error("Failed to parse bytes: {0}")]
pub struct ParseBytesError(String);
impl FromStr for Bytes {
type Err = ParseBytesError;
fn from_str(value: &str) -> Result<Self, Self::Err> {
if value.len() >= 2 && &value[0..2] == "0x" {
let bytes: Vec<u8> = hex::decode(&value[2..])
.map_err(|e| ParseBytesError(format!("Invalid hex: {}", e)))?;
Ok(bytes.into())
} else {
Err(ParseBytesError("Doesn't start with 0x".to_string()))
}
}
}
pub fn serialize_bytes<S, T>(x: T, s: S) -> Result<S::Ok, S::Error> pub fn serialize_bytes<S, T>(x: T, s: S) -> Result<S::Ok, S::Error>
where where
S: Serializer, S: Serializer,
@ -97,4 +120,16 @@ mod tests {
assert_eq!(format!("{:x}", b), expected); assert_eq!(format!("{:x}", b), expected);
assert_eq!(format!("{}", b), expected); assert_eq!(format!("{}", b), expected);
} }
#[test]
fn test_from_str() {
let b = Bytes::from_str("0x1213");
assert!(b.is_ok());
let b = b.unwrap();
assert_eq!(b.as_ref(), hex::decode("1213").unwrap());
let b = Bytes::from_str("1213");
assert!(b.is_err());
assert_eq!(b.err().unwrap().0, "Doesn't start with 0x");
}
} }