1
1
use crate :: { Enr , EnrKey , EnrPublicKey , Error , Key , NodeId , MAX_ENR_SIZE } ;
2
+ use crate :: {
3
+ ENR_VERSION , ID_ENR_KEY , IP6_ENR_KEY , IP_ENR_KEY , TCP6_ENR_KEY , TCP_ENR_KEY , UDP6_ENR_KEY ,
4
+ UDP_ENR_KEY ,
5
+ } ;
2
6
use alloy_rlp:: { Encodable , Header } ;
3
7
use bytes:: { Bytes , BytesMut } ;
4
8
use std:: {
@@ -27,7 +31,7 @@ impl<K: EnrKey> Default for Builder<K> {
27
31
/// Constructs a minimal [`Builder`] for the v4 identity scheme.
28
32
fn default ( ) -> Self {
29
33
Self {
30
- id : String :: from ( "v4 ") ,
34
+ id : String :: from_utf8 ( ENR_VERSION . into ( ) ) . expect ( "Is a valid string ") ,
31
35
seq : 1 ,
32
36
content : BTreeMap :: new ( ) ,
33
37
phantom : PhantomData ,
@@ -65,13 +69,13 @@ impl<K: EnrKey> Builder<K> {
65
69
66
70
/// Adds an `ip` field to the `ENRBuilder`.
67
71
pub fn ip4 ( & mut self , ip : Ipv4Addr ) -> & mut Self {
68
- self . add_value ( "ip" , & ip. octets ( ) . as_ref ( ) ) ;
72
+ self . add_value ( IP_ENR_KEY , & ip. octets ( ) . as_ref ( ) ) ;
69
73
self
70
74
}
71
75
72
76
/// Adds an `ip6` field to the `ENRBuilder`.
73
77
pub fn ip6 ( & mut self , ip : Ipv6Addr ) -> & mut Self {
74
- self . add_value ( "ip6" , & ip. octets ( ) . as_ref ( ) ) ;
78
+ self . add_value ( IP6_ENR_KEY , & ip. octets ( ) . as_ref ( ) ) ;
75
79
self
76
80
}
77
81
@@ -81,32 +85,32 @@ impl<K: EnrKey> Builder<K> {
81
85
82
86
/// Adds an `Id` field to the `ENRBuilder`.
83
87
pub fn id(&mut self, id: &str) -> &mut Self {
84
- self.add_value("id" , &id.as_bytes());
88
+ self.add_value(ID_ENR_KEY , &id.as_bytes());
85
89
self
86
90
}
87
91
*/
88
92
89
93
/// Adds a `tcp` field to the `ENRBuilder`.
90
94
pub fn tcp4 ( & mut self , tcp : u16 ) -> & mut Self {
91
- self . add_value ( "tcp" , & tcp) ;
95
+ self . add_value ( TCP_ENR_KEY , & tcp) ;
92
96
self
93
97
}
94
98
95
99
/// Adds a `tcp6` field to the `ENRBuilder`.
96
100
pub fn tcp6 ( & mut self , tcp : u16 ) -> & mut Self {
97
- self . add_value ( "tcp6" , & tcp) ;
101
+ self . add_value ( TCP6_ENR_KEY , & tcp) ;
98
102
self
99
103
}
100
104
101
105
/// Adds a `udp` field to the `ENRBuilder`.
102
106
pub fn udp4 ( & mut self , udp : u16 ) -> & mut Self {
103
- self . add_value ( "udp" , & udp) ;
107
+ self . add_value ( UDP_ENR_KEY , & udp) ;
104
108
self
105
109
}
106
110
107
111
/// Adds a `udp6` field to the `ENRBuilder`.
108
112
pub fn udp6 ( & mut self , udp : u16 ) -> & mut Self {
109
- self . add_value ( "udp6" , & udp) ;
113
+ self . add_value ( UDP6_ENR_KEY , & udp) ;
110
114
self
111
115
}
112
116
@@ -179,7 +183,7 @@ impl<K: EnrKey> Builder<K> {
179
183
180
184
let mut id_bytes = BytesMut :: with_capacity ( self . id . length ( ) ) ;
181
185
self . id . as_bytes ( ) . encode ( & mut id_bytes) ;
182
- self . add_value_rlp ( "id" , id_bytes. freeze ( ) ) ;
186
+ self . add_value_rlp ( ID_ENR_KEY , id_bytes. freeze ( ) ) ;
183
187
184
188
self . add_public_key ( & key. public ( ) ) ;
185
189
let rlp_content = self . rlp_content ( ) ;
0 commit comments