@@ -130,8 +130,6 @@ mod tests {
130
130
use mithril_common:: crypto_helper:: tests_setup:: setup_certificate_chain;
131
131
132
132
use crate :: database:: test_helper:: { insert_certificate_records, main_db_connection} ;
133
- use crate :: dependency_injection:: DependenciesBuilder ;
134
- use crate :: Configuration ;
135
133
136
134
use super :: * ;
137
135
@@ -239,8 +237,7 @@ mod tests {
239
237
async fn repository_get_certificate ( ) {
240
238
let ( certificates, _) = setup_certificate_chain ( 5 , 2 ) ;
241
239
let expected_hash = certificates[ 0 ] . hash . clone ( ) ;
242
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
243
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
240
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
244
241
insert_certificate_records ( & connection, certificates. clone ( ) ) ;
245
242
246
243
let repository: CertificateRepository = CertificateRepository :: new ( connection) ;
@@ -262,8 +259,7 @@ mod tests {
262
259
#[ tokio:: test]
263
260
async fn repository_get_latest_certificates ( ) {
264
261
let ( certificates, _) = setup_certificate_chain ( 5 , 2 ) ;
265
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
266
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
262
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
267
263
insert_certificate_records ( & connection, certificates. clone ( ) ) ;
268
264
269
265
let repository = CertificateRepository :: new ( connection) ;
@@ -278,8 +274,7 @@ mod tests {
278
274
279
275
#[ tokio:: test]
280
276
async fn get_master_certificate_no_certificate_recorded_returns_none ( ) {
281
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
282
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
277
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
283
278
284
279
let repository: CertificateRepository = CertificateRepository :: new ( connection) ;
285
280
let certificate = repository
@@ -292,8 +287,7 @@ mod tests {
292
287
293
288
#[ tokio:: test]
294
289
async fn get_master_certificate_one_cert_in_current_epoch_recorded_returns_that_one ( ) {
295
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
296
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
290
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
297
291
let certificate = CertificateRecord :: dummy_genesis ( "1" , Epoch ( 1 ) , 1 ) ;
298
292
let expected_certificate: Certificate = certificate. clone ( ) . into ( ) ;
299
293
insert_certificate_records ( & connection, vec ! [ certificate] ) ;
@@ -311,8 +305,7 @@ mod tests {
311
305
#[ tokio:: test]
312
306
async fn get_master_certificate_multiple_cert_in_current_epoch_returns_first_of_current_epoch ( )
313
307
{
314
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
315
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
308
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
316
309
let certificates = vec ! [
317
310
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
318
311
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -334,8 +327,7 @@ mod tests {
334
327
#[ tokio:: test]
335
328
async fn get_master_certificate_multiple_cert_in_previous_epoch_none_in_the_current_returns_first_of_previous_epoch (
336
329
) {
337
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
338
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
330
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
339
331
let certificates = vec ! [
340
332
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
341
333
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -357,8 +349,7 @@ mod tests {
357
349
#[ tokio:: test]
358
350
async fn get_master_certificate_multiple_cert_in_previous_one_cert_in_current_epoch_returns_one_in_current_epoch (
359
351
) {
360
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
361
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
352
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
362
353
let certificates = vec ! [
363
354
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
364
355
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -381,8 +372,7 @@ mod tests {
381
372
#[ tokio:: test]
382
373
async fn get_master_certificate_multiple_cert_in_previous_multiple_in_current_epoch_returns_first_of_current_epoch (
383
374
) {
384
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
385
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
375
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
386
376
let certificates = vec ! [
387
377
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
388
378
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -406,8 +396,7 @@ mod tests {
406
396
#[ tokio:: test]
407
397
async fn get_master_certificate_multiple_cert_in_penultimate_epoch_none_in_previous_returns_none (
408
398
) {
409
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
410
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
399
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
411
400
let certificates = vec ! [
412
401
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
413
402
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -427,8 +416,7 @@ mod tests {
427
416
#[ tokio:: test]
428
417
async fn get_master_certificate_second_genesis_after_multiple_cert_in_current_epoch_returns_last_genesis (
429
418
) {
430
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
431
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
419
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
432
420
let certificates = vec ! [
433
421
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
434
422
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -451,8 +439,7 @@ mod tests {
451
439
#[ tokio:: test]
452
440
async fn get_master_certificate_second_genesis_after_multiple_cert_in_multiple_epochs_returns_last_genesis (
453
441
) {
454
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
455
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
442
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
456
443
let certificates = vec ! [
457
444
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
458
445
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -477,8 +464,7 @@ mod tests {
477
464
#[ tokio:: test]
478
465
async fn get_master_certificate_new_genesis_after_multiple_cert_in_previous_epoch_returns_last_genesis (
479
466
) {
480
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
481
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
467
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
482
468
let certificates = vec ! [
483
469
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
484
470
CertificateRecord :: dummy_db_snapshot( "2" , "1" , Epoch ( 1 ) , 2 ) ,
@@ -503,8 +489,7 @@ mod tests {
503
489
let ( certificates, _) = setup_certificate_chain ( 3 , 1 ) ;
504
490
let expected_certificate_id = & certificates[ 2 ] . hash ;
505
491
let epoch = & certificates[ 2 ] . epoch ;
506
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
507
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
492
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
508
493
insert_certificate_records ( & connection, certificates. clone ( ) ) ;
509
494
510
495
let repository: CertificateRepository = CertificateRepository :: new ( connection) ;
@@ -520,17 +505,15 @@ mod tests {
520
505
#[ tokio:: test]
521
506
async fn save_certificate ( ) {
522
507
let ( certificates, _) = setup_certificate_chain ( 5 , 3 ) ;
523
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
524
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
525
- let repository: CertificateRepository = CertificateRepository :: new ( connection) ;
508
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
509
+ let repository: CertificateRepository = CertificateRepository :: new ( connection. clone ( ) ) ;
526
510
let certificate = repository
527
511
. create_certificate ( certificates[ 4 ] . clone ( ) )
528
512
. await
529
513
. unwrap ( ) ;
530
514
531
515
assert_eq ! ( certificates[ 4 ] . hash, certificate. hash) ;
532
516
{
533
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
534
517
let cert = connection
535
518
. fetch_first ( GetCertificateRecordQuery :: by_certificate_id (
536
519
& certificates[ 4 ] . hash ,
@@ -544,8 +527,7 @@ mod tests {
544
527
545
528
#[ tokio:: test]
546
529
async fn delete_only_given_certificates ( ) {
547
- let mut deps = DependenciesBuilder :: new_for_test ( Configuration :: new_sample ( ) ) ;
548
- let connection = deps. get_sqlite_connection ( ) . await . unwrap ( ) ;
530
+ let connection = Arc :: new ( main_db_connection ( ) . unwrap ( ) ) ;
549
531
let repository = CertificateRepository :: new ( connection. clone ( ) ) ;
550
532
let records = vec ! [
551
533
CertificateRecord :: dummy_genesis( "1" , Epoch ( 1 ) , 1 ) ,
0 commit comments