Skip to content

Commit aa12e38

Browse files
morph-devmorph-dev
authored
Update 'enr' dependency (#223)
1 parent e64446b commit aa12e38

File tree

13 files changed

+38
-60
lines changed

13 files changed

+38
-60
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
1212
exclude = [".gitignore", ".github/*"]
1313

1414
[dependencies]
15-
enr = { version = "0.9", features = ["k256", "ed25519"] }
15+
enr = { version = "0.10", features = ["k256", "ed25519"] }
1616
tokio = { version = "1", features = ["net", "sync", "macros", "rt"] }
1717
libp2p = { version = "0.52", features = ["ed25519", "secp256k1"], optional = true }
1818
zeroize = { version = "1", features = ["zeroize_derive"] }

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ A simple example of creating this service is as follows:
4343

4444
// construct a local ENR
4545
let enr_key = CombinedKey::generate_secp256k1();
46-
let enr = enr::EnrBuilder::new("v4").build(&enr_key).unwrap();
46+
let enr = enr::Enr::empty(&enr_key).unwrap();
4747

4848
// build the tokio executor
4949
let mut runtime = tokio::runtime::Builder::new_multi_thread()

‎examples/custom_executor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn main() {
2929

3030
let enr_key = CombinedKey::generate_secp256k1();
3131
// construct a local ENR
32-
let enr = enr::EnrBuilder::new("v4").build(&enr_key).unwrap();
32+
let enr = enr::Enr::empty(&enr_key).unwrap();
3333

3434
// build the tokio executor
3535
let runtime = tokio::runtime::Builder::new_multi_thread()

‎examples/find_nodes.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ async fn main() {
9090
};
9191

9292
let enr = {
93-
let mut builder = enr::EnrBuilder::new("v4");
93+
let mut builder = enr::Enr::builder();
9494
if let Some(ip4) = args.enr_ip4 {
9595
// if the given address is the UNSPECIFIED address we want to advertise localhost
9696
if ip4.is_unspecified() {

‎examples/request_enr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async fn main() {
4343
// generate a new enr key
4444
let enr_key = CombinedKey::generate_secp256k1();
4545
// construct a local ENR
46-
let enr = enr::EnrBuilder::new("v4").build(&enr_key).unwrap();
46+
let enr = enr::Enr::empty(&enr_key).unwrap();
4747

4848
// default discv5 configuration
4949
let config = ConfigBuilder::new(listen_config).build();

‎examples/simple_server.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ async fn main() {
4646

4747
// construct a local ENR
4848
let enr = {
49-
let mut builder = enr::EnrBuilder::new("v4");
49+
let mut builder = enr::Enr::builder();
5050
// if an IP was specified, use it
5151
if let Some(external_address) = address {
5252
builder.ip4(external_address);

‎src/discv5/test.rs‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![cfg(test)]
22

33
use crate::{socket::ListenConfig, Discv5, *};
4-
use enr::{k256, CombinedKey, Enr, EnrBuilder, EnrKey, NodeId};
4+
use enr::{k256, CombinedKey, Enr, EnrKey, NodeId};
55
use rand_core::{RngCore, SeedableRng};
66
use std::{
77
collections::HashMap,
@@ -28,11 +28,7 @@ async fn build_nodes(n: usize, base_port: u16) -> Vec<Discv5> {
2828
let listen_config = ListenConfig::Ipv4 { ip, port };
2929
let config = ConfigBuilder::new(listen_config).build();
3030

31-
let enr = EnrBuilder::new("v4")
32-
.ip4(ip)
33-
.udp4(port)
34-
.build(&enr_key)
35-
.unwrap();
31+
let enr = Enr::builder().ip4(ip).udp4(port).build(&enr_key).unwrap();
3632
// transport for building a swarm
3733
let mut discv5 = Discv5::new(enr, enr_key, config).unwrap();
3834
discv5.start().await.unwrap();
@@ -52,11 +48,7 @@ async fn build_nodes_from_keypairs(keys: Vec<CombinedKey>, base_port: u16) -> Ve
5248
let listen_config = ListenConfig::Ipv4 { ip, port };
5349
let config = ConfigBuilder::new(listen_config).build();
5450

55-
let enr = EnrBuilder::new("v4")
56-
.ip4(ip)
57-
.udp4(port)
58-
.build(&enr_key)
59-
.unwrap();
51+
let enr = Enr::builder().ip4(ip).udp4(port).build(&enr_key).unwrap();
6052

6153
let mut discv5 = Discv5::new(enr, enr_key, config).unwrap();
6254
discv5.start().await.unwrap();
@@ -77,7 +69,7 @@ async fn build_nodes_from_keypairs_ipv6(keys: Vec<CombinedKey>, base_port: u16)
7769
};
7870
let config = ConfigBuilder::new(listen_config).build();
7971

80-
let enr = EnrBuilder::new("v4")
72+
let enr = Enr::builder()
8173
.ip6(Ipv6Addr::LOCALHOST)
8274
.udp6(port)
8375
.build(&enr_key)
@@ -108,7 +100,7 @@ async fn build_nodes_from_keypairs_dual_stack(
108100
};
109101
let config = ConfigBuilder::new(listen_config).build();
110102

111-
let enr = EnrBuilder::new("v4")
103+
let enr = Enr::builder()
112104
.ip4(Ipv4Addr::LOCALHOST)
113105
.udp4(ipv4_port)
114106
.ip6(Ipv6Addr::LOCALHOST)
@@ -744,11 +736,7 @@ async fn test_table_limits() {
744736
let mut keypairs = generate_deterministic_keypair(12, 9487);
745737
let ip: Ipv4Addr = "127.0.0.1".parse().unwrap();
746738
let enr_key: CombinedKey = keypairs.remove(0);
747-
let enr = EnrBuilder::new("v4")
748-
.ip4(ip)
749-
.udp4(9050)
750-
.build(&enr_key)
751-
.unwrap();
739+
let enr = Enr::builder().ip4(ip).udp4(9050).build(&enr_key).unwrap();
752740
let listen_config = ListenConfig::Ipv4 {
753741
ip: enr.ip4().unwrap(),
754742
port: enr.udp4().unwrap(),
@@ -763,7 +751,7 @@ async fn test_table_limits() {
763751
.map(|i| {
764752
let ip: Ipv4Addr = Ipv4Addr::new(192, 168, 1, i as u8);
765753
let enr_key: CombinedKey = keypairs.remove(0);
766-
EnrBuilder::new("v4")
754+
Enr::builder()
767755
.ip4(ip)
768756
.udp4(9050 + i as u16)
769757
.build(&enr_key)
@@ -782,19 +770,15 @@ async fn test_table_limits() {
782770
async fn test_bucket_limits() {
783771
let enr_key = CombinedKey::generate_secp256k1();
784772
let ip: Ipv4Addr = "127.0.0.1".parse().unwrap();
785-
let enr = EnrBuilder::new("v4")
786-
.ip4(ip)
787-
.udp4(9500)
788-
.build(&enr_key)
789-
.unwrap();
773+
let enr = Enr::builder().ip4(ip).udp4(9500).build(&enr_key).unwrap();
790774
let bucket_limit: usize = 2;
791775
// Generate `bucket_limit + 1` keypairs that go in `enr` node's 256th bucket.
792776
let keys = {
793777
let mut keys = Vec::new();
794778
for _ in 0..bucket_limit + 1 {
795779
loop {
796780
let key = CombinedKey::generate_secp256k1();
797-
let enr_new = EnrBuilder::new("v4").build(&key).unwrap();
781+
let enr_new = Enr::empty(&key).unwrap();
798782
let node_key: Key<NodeId> = enr.node_id().into();
799783
let distance = node_key.log2_distance(&enr_new.node_id().into()).unwrap();
800784
if distance == 256 {
@@ -810,7 +794,7 @@ async fn test_bucket_limits() {
810794
.map(|i| {
811795
let kp = &keys[i - 1];
812796
let ip: Ipv4Addr = Ipv4Addr::new(192, 168, 1, i as u8);
813-
EnrBuilder::new("v4")
797+
Enr::builder()
814798
.ip4(ip)
815799
.udp4(9500 + i as u16)
816800
.build(kp)

‎src/handler/crypto/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ mod tests {
223223
use crate::packet::DefaultProtocolId;
224224

225225
use super::*;
226-
use enr::{CombinedKey, EnrBuilder, EnrKey};
226+
use enr::{CombinedKey, Enr, EnrKey};
227227
use std::convert::TryInto;
228228

229229
fn hex_decode(x: &'static str) -> Vec<u8> {
@@ -341,12 +341,12 @@ mod tests {
341341
let node1_key = CombinedKey::generate_secp256k1();
342342
let node2_key = CombinedKey::generate_secp256k1();
343343

344-
let node1_enr = EnrBuilder::new("v4")
344+
let node1_enr = Enr::builder()
345345
.ip("127.0.0.1".parse().unwrap())
346346
.udp4(9000)
347347
.build(&node1_key)
348348
.unwrap();
349-
let node2_enr = EnrBuilder::new("v4")
349+
let node2_enr = Enr::builder()
350350
.ip("127.0.0.1".parse().unwrap())
351351
.udp4(9000)
352352
.build(&node2_key)

‎src/handler/tests.rs‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use crate::{
1717
RequestError::SelfRequest,
1818
};
1919
use active_requests::ActiveRequests;
20-
use enr::EnrBuilder;
2120
use std::time::Duration;
2221
use tokio::time::sleep;
2322

@@ -108,12 +107,12 @@ async fn simple_session_message() {
108107
let key1 = CombinedKey::generate_secp256k1();
109108
let key2 = CombinedKey::generate_secp256k1();
110109

111-
let sender_enr = EnrBuilder::new("v4")
110+
let sender_enr = Enr::builder()
112111
.ip4(ip)
113112
.udp4(sender_port)
114113
.build(&key1)
115114
.unwrap();
116-
let receiver_enr = EnrBuilder::new("v4")
115+
let receiver_enr = Enr::builder()
117116
.ip4(ip)
118117
.udp4(receiver_port)
119118
.build(&key2)
@@ -195,13 +194,13 @@ async fn multiple_messages() {
195194
let key1 = CombinedKey::generate_secp256k1();
196195
let key2 = CombinedKey::generate_secp256k1();
197196

198-
let sender_enr = EnrBuilder::new("v4")
197+
let sender_enr = Enr::builder()
199198
.ip4(ip)
200199
.udp4(sender_port)
201200
.build(&key1)
202201
.unwrap();
203202

204-
let receiver_enr = EnrBuilder::new("v4")
203+
let receiver_enr = Enr::builder()
205204
.ip4(ip)
206205
.udp4(receiver_port)
207206
.build(&key2)
@@ -345,11 +344,7 @@ async fn test_active_requests_insert() {
345344

346345
let key = CombinedKey::generate_secp256k1();
347346

348-
let enr = EnrBuilder::new("v4")
349-
.ip4(ip)
350-
.udp4(port)
351-
.build(&key)
352-
.unwrap();
347+
let enr = Enr::builder().ip4(ip).udp4(port).build(&key).unwrap();
353348
let node_id = enr.node_id();
354349

355350
let contact: NodeContact = enr.into();
@@ -374,7 +369,7 @@ async fn test_self_request_ipv4() {
374369
init();
375370

376371
let key = CombinedKey::generate_secp256k1();
377-
let enr = EnrBuilder::new("v4")
372+
let enr = Enr::builder()
378373
.ip4(Ipv4Addr::LOCALHOST)
379374
.udp4(5004)
380375
.build(&key)
@@ -414,7 +409,7 @@ async fn test_self_request_ipv6() {
414409
init();
415410

416411
let key = CombinedKey::generate_secp256k1();
417-
let enr = EnrBuilder::new("v4")
412+
let enr = Enr::builder()
418413
.ip6(Ipv6Addr::LOCALHOST)
419414
.udp6(5005)
420415
.build(&key)
@@ -451,7 +446,7 @@ async fn test_self_request_ipv6() {
451446
async fn remove_one_time_session() {
452447
let config = ConfigBuilder::new(ListenConfig::default()).build();
453448
let key = CombinedKey::generate_secp256k1();
454-
let enr = EnrBuilder::new("v4")
449+
let enr = Enr::builder()
455450
.ip4(Ipv4Addr::LOCALHOST)
456451
.udp4(9000)
457452
.build(&key)
@@ -460,7 +455,7 @@ async fn remove_one_time_session() {
460455

461456
let enr = {
462457
let key = CombinedKey::generate_secp256k1();
463-
EnrBuilder::new("v4")
458+
Enr::builder()
464459
.ip4(Ipv4Addr::LOCALHOST)
465460
.udp4(9000)
466461
.build(&key)

‎src/ipmode.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ mod tests {
136136

137137
fn test(&self) {
138138
let test_enr = {
139-
let builder = &mut enr::EnrBuilder::new("v4");
139+
let builder = &mut enr::Enr::builder();
140140
if let Some(ip4) = self.enr_ip4 {
141141
builder.ip4(ip4).udp4(IP4_TEST_PORT);
142142
}

0 commit comments

Comments
 (0)