@@ -104,6 +104,8 @@ mod tests {
104
104
105
105
// Authentication keys (for private trackers)
106
106
107
+ handling_authentication_keys:: it_should_load_the_keys ( driver) ;
108
+
107
109
// Permanent keys
108
110
handling_authentication_keys:: it_should_save_and_load_permanent_authentication_keys ( driver) ;
109
111
handling_authentication_keys:: it_should_remove_a_permanent_authentication_key ( driver) ;
@@ -114,10 +116,10 @@ mod tests {
114
116
115
117
// Whitelist (for listed trackers)
116
118
119
+ handling_the_whitelist:: it_should_load_the_whitelist ( driver) ;
117
120
handling_the_whitelist:: it_should_add_and_get_infohashes ( driver) ;
118
121
handling_the_whitelist:: it_should_remove_an_infohash_from_the_whitelist ( driver) ;
119
122
handling_the_whitelist:: it_should_fail_trying_to_add_the_same_infohash_twice ( driver) ;
120
- handling_the_whitelist:: it_load_the_whitelist ( driver) ;
121
123
}
122
124
123
125
/// It initializes the database schema.
@@ -172,9 +174,22 @@ mod tests {
172
174
use std:: sync:: Arc ;
173
175
use std:: time:: Duration ;
174
176
175
- use crate :: authentication:: key:: { generate_key , generate_permanent_key} ;
177
+ use crate :: authentication:: key:: { generate_expiring_key , generate_permanent_key} ;
176
178
use crate :: databases:: Database ;
177
179
180
+ pub fn it_should_load_the_keys ( driver : & Arc < Box < dyn Database > > ) {
181
+ let permanent_peer_key = generate_permanent_key ( ) ;
182
+ driver. add_key_to_keys ( & permanent_peer_key) . unwrap ( ) ;
183
+
184
+ let expiring_peer_key = generate_expiring_key ( Duration :: from_secs ( 120 ) ) ;
185
+ driver. add_key_to_keys ( & expiring_peer_key) . unwrap ( ) ;
186
+
187
+ let keys = driver. load_keys ( ) . unwrap ( ) ;
188
+
189
+ assert ! ( keys. contains( & permanent_peer_key) ) ;
190
+ assert ! ( keys. contains( & expiring_peer_key) ) ;
191
+ }
192
+
178
193
pub fn it_should_save_and_load_permanent_authentication_keys ( driver : & Arc < Box < dyn Database > > ) {
179
194
let peer_key = generate_permanent_key ( ) ;
180
195
driver. add_key_to_keys ( & peer_key) . unwrap ( ) ;
@@ -185,7 +200,7 @@ mod tests {
185
200
}
186
201
187
202
pub fn it_should_save_and_load_expiring_authentication_keys ( driver : & Arc < Box < dyn Database > > ) {
188
- let peer_key = generate_key ( Some ( Duration :: from_secs ( 120 ) ) ) ;
203
+ let peer_key = generate_expiring_key ( Duration :: from_secs ( 120 ) ) ;
189
204
driver. add_key_to_keys ( & peer_key) . unwrap ( ) ;
190
205
191
206
let stored_peer_key = driver. get_key_from_keys ( & peer_key. key ( ) ) . unwrap ( ) . unwrap ( ) ;
@@ -204,7 +219,7 @@ mod tests {
204
219
}
205
220
206
221
pub fn it_should_remove_an_expiring_authentication_key ( driver : & Arc < Box < dyn Database > > ) {
207
- let peer_key = generate_key ( Some ( Duration :: from_secs ( 120 ) ) ) ;
222
+ let peer_key = generate_expiring_key ( Duration :: from_secs ( 120 ) ) ;
208
223
driver. add_key_to_keys ( & peer_key) . unwrap ( ) ;
209
224
210
225
driver. remove_key_from_keys ( & peer_key. key ( ) ) . unwrap ( ) ;
@@ -220,6 +235,15 @@ mod tests {
220
235
use crate :: core_tests:: random_info_hash;
221
236
use crate :: databases:: Database ;
222
237
238
+ pub fn it_should_load_the_whitelist ( driver : & Arc < Box < dyn Database > > ) {
239
+ let infohash = random_info_hash ( ) ;
240
+ driver. add_info_hash_to_whitelist ( infohash) . unwrap ( ) ;
241
+
242
+ let whitelist = driver. load_whitelist ( ) . unwrap ( ) ;
243
+
244
+ assert ! ( whitelist. contains( & infohash) ) ;
245
+ }
246
+
223
247
pub fn it_should_add_and_get_infohashes ( driver : & Arc < Box < dyn Database > > ) {
224
248
let infohash = random_info_hash ( ) ;
225
249
@@ -247,14 +271,5 @@ mod tests {
247
271
248
272
assert ! ( result. is_err( ) ) ;
249
273
}
250
-
251
- pub fn it_load_the_whitelist ( driver : & Arc < Box < dyn Database > > ) {
252
- let infohash = random_info_hash ( ) ;
253
- driver. add_info_hash_to_whitelist ( infohash) . unwrap ( ) ;
254
-
255
- let whitelist = driver. load_whitelist ( ) . unwrap ( ) ;
256
-
257
- assert ! ( whitelist. contains( & infohash) ) ;
258
- }
259
274
}
260
275
}
0 commit comments