diff --git a/README.md b/README.md index d13f76b..e993444 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ let mut enr = Enr::builder().ip4(ip).tcp4(8000).build(&key).unwrap(); enr.set_tcp4(8001, &key); // set a custom key -enr.insert("custom_key", &vec![0,0,1], &key); +enr.insert("custom_key", &[0,0,1], &key); // encode to base64 let base_64_string = enr.to_base64(); @@ -128,29 +128,27 @@ let decoded_enr: DefaultEnr = base_64_string.parse().unwrap(); assert_eq!(decoded_enr.ip4(), Some("192.168.0.1".parse().unwrap())); assert_eq!(decoded_enr.id(), Some("v4".into())); assert_eq!(decoded_enr.tcp4(), Some(8001)); -assert_eq!(decoded_enr.get("custom_key"), Some(vec![0,0,1].as_slice())); +assert_eq!(decoded_enr.get("custom_key").as_ref().map(AsRef::as_ref), Some(vec![0,0,1]).as_deref()); ``` #### Encoding/Decoding ENR's of various key types ```rust -use enr::{k256::ecdsa::SigningKey, Enr, ed25519_dalek::Keypair, CombinedKey}; +use enr::{ed25519_dalek as ed25519, k256::ecdsa, CombinedKey, Enr}; use std::net::Ipv4Addr; use rand::thread_rng; -use rand::Rng; // generate a random secp256k1 key let mut rng = thread_rng(); -let key = SigningKey::random(&mut rng); -let ip = Ipv4Addr::new(192,168,0,1); +let key = ecdsa::SigningKey::random(&mut rng); +let ip = Ipv4Addr::new(192, 168, 0, 1); let enr_secp256k1 = Enr::builder().ip4(ip).tcp4(8000).build(&key).unwrap(); // encode to base64 let base64_string_secp256k1 = enr_secp256k1.to_base64(); // generate a random ed25519 key -let mut rng = rand_07::thread_rng(); -let key = Keypair::generate(&mut rng); +let key = ed25519::SigningKey::generate(&mut rng); let enr_ed25519 = Enr::builder().ip4(ip).tcp4(8000).build(&key).unwrap(); // encode to base64 @@ -158,9 +156,9 @@ let base64_string_ed25519 = enr_ed25519.to_base64(); // decode base64 strings of varying key types // decode the secp256k1 with default Enr -let decoded_enr_secp256k1: Enr = base64_string_secp256k1.parse().unwrap(); +let decoded_enr_secp256k1: Enr = base64_string_secp256k1.parse().unwrap(); // decode ed25519 ENRs -let decoded_enr_ed25519: Enr = base64_string_ed25519.parse().unwrap(); +let decoded_enr_ed25519: Enr = base64_string_ed25519.parse().unwrap(); // use the combined key to be able to decode either let decoded_enr: Enr = base64_string_secp256k1.parse().unwrap(); diff --git a/src/lib.rs b/src/lib.rs index faeb4ef..a3d1bc4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -132,10 +132,9 @@ //! //! ```rust //! # #[cfg(feature = "ed25519")] { -//! use enr::{k256::ecdsa, Enr, ed25519_dalek as ed25519, CombinedKey}; +//! use enr::{ed25519_dalek as ed25519, k256::ecdsa, CombinedKey, Enr}; //! use std::net::Ipv4Addr; //! use rand::thread_rng; -//! use rand::Rng; //! //! // generate a random secp256k1 key //! let mut rng = thread_rng(); @@ -155,9 +154,9 @@ //! //! // decode base64 strings of varying key types //! // decode the secp256k1 with default Enr -//! let decoded_enr_secp256k1: Enr = base64_string_secp256k1.parse().unwrap(); +//! let decoded_enr_secp256k1: Enr = base64_string_secp256k1.parse().unwrap(); //! // decode ed25519 ENRs -//! let decoded_enr_ed25519: Enr = base64_string_ed25519.parse().unwrap(); +//! let decoded_enr_ed25519: Enr = base64_string_ed25519.parse().unwrap(); //! //! // use the combined key to be able to decode either //! let decoded_enr: Enr = base64_string_secp256k1.parse().unwrap();