diff --git a/ethbloom/Cargo.toml b/ethbloom/Cargo.toml index 09ee606..a3a421d 100644 --- a/ethbloom/Cargo.toml +++ b/ethbloom/Cargo.toml @@ -17,7 +17,7 @@ serde = { version = "1.0", optional = true } [dev-dependencies] rand = { version = "0.4" } -rustc-hex = "2.0" +hex-literal = "0.1.1" [features] default = ["std", "heapsizeof", "serialize", "fixed-hash/libc"] diff --git a/ethbloom/src/lib.rs b/ethbloom/src/lib.rs index 78a8d77..462551c 100644 --- a/ethbloom/src/lib.rs +++ b/ethbloom/src/lib.rs @@ -1,14 +1,13 @@ //! //! ```rust //! extern crate ethbloom; -//! extern crate rustc_hex; -//! use rustc_hex::FromHex; +//! #[macro_use] extern crate hex_literal; //! use ethbloom::{Bloom, Input}; //! //! fn main() { //! let bloom: Bloom = "00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into(); -//! let address = "ef2d6d194084c2de36e0dabfce45d046b37d1106".from_hex().unwrap(); -//! let topic = "02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc".from_hex().unwrap(); +//! let address = hex!("ef2d6d194084c2de36e0dabfce45d046b37d1106"); +//! let topic = hex!("02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc"); //! //! let mut my_bloom = Bloom::default(); //! assert!(!my_bloom.contains_input(Input::Raw(&address))); @@ -44,6 +43,10 @@ extern crate ethereum_types_serialize; #[cfg(feature="serialize")] extern crate serde; +#[cfg(test)] +#[macro_use] +extern crate hex_literal; + #[cfg(feature="serialize")] use serde::{Serialize, Serializer, Deserialize, Deserializer}; @@ -254,15 +257,13 @@ impl<'de> Deserialize<'de> for Bloom { #[cfg(test)] mod tests { - extern crate rustc_hex; - use self::rustc_hex::FromHex; use {Bloom, Input}; #[test] fn it_works() { let bloom: Bloom = "00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into(); - let address = "ef2d6d194084c2de36e0dabfce45d046b37d1106".from_hex().unwrap(); - let topic = "02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc".from_hex().unwrap(); + let address = hex!("ef2d6d194084c2de36e0dabfce45d046b37d1106"); + let topic = hex!("02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc"); let mut my_bloom = Bloom::default(); assert!(!my_bloom.contains_input(Input::Raw(&address)));