Skip to content

Commit e71d930

Browse files
committed
test(aggregator): use simpler method to build sqlite connection in certificate_repository
1 parent 1111de0 commit e71d930

File tree

1 file changed

+16
-34
lines changed

1 file changed

+16
-34
lines changed

mithril-aggregator/src/database/repository/certificate_repository.rs

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ mod tests {
130130
use mithril_common::crypto_helper::tests_setup::setup_certificate_chain;
131131

132132
use crate::database::test_helper::{insert_certificate_records, main_db_connection};
133-
use crate::dependency_injection::DependenciesBuilder;
134-
use crate::Configuration;
135133

136134
use super::*;
137135

@@ -239,8 +237,7 @@ mod tests {
239237
async fn repository_get_certificate() {
240238
let (certificates, _) = setup_certificate_chain(5, 2);
241239
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());
244241
insert_certificate_records(&connection, certificates.clone());
245242

246243
let repository: CertificateRepository = CertificateRepository::new(connection);
@@ -262,8 +259,7 @@ mod tests {
262259
#[tokio::test]
263260
async fn repository_get_latest_certificates() {
264261
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());
267263
insert_certificate_records(&connection, certificates.clone());
268264

269265
let repository = CertificateRepository::new(connection);
@@ -278,8 +274,7 @@ mod tests {
278274

279275
#[tokio::test]
280276
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());
283278

284279
let repository: CertificateRepository = CertificateRepository::new(connection);
285280
let certificate = repository
@@ -292,8 +287,7 @@ mod tests {
292287

293288
#[tokio::test]
294289
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());
297291
let certificate = CertificateRecord::dummy_genesis("1", Epoch(1), 1);
298292
let expected_certificate: Certificate = certificate.clone().into();
299293
insert_certificate_records(&connection, vec![certificate]);
@@ -311,8 +305,7 @@ mod tests {
311305
#[tokio::test]
312306
async fn get_master_certificate_multiple_cert_in_current_epoch_returns_first_of_current_epoch()
313307
{
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());
316309
let certificates = vec![
317310
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
318311
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -334,8 +327,7 @@ mod tests {
334327
#[tokio::test]
335328
async fn get_master_certificate_multiple_cert_in_previous_epoch_none_in_the_current_returns_first_of_previous_epoch(
336329
) {
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());
339331
let certificates = vec![
340332
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
341333
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -357,8 +349,7 @@ mod tests {
357349
#[tokio::test]
358350
async fn get_master_certificate_multiple_cert_in_previous_one_cert_in_current_epoch_returns_one_in_current_epoch(
359351
) {
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());
362353
let certificates = vec![
363354
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
364355
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -381,8 +372,7 @@ mod tests {
381372
#[tokio::test]
382373
async fn get_master_certificate_multiple_cert_in_previous_multiple_in_current_epoch_returns_first_of_current_epoch(
383374
) {
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());
386376
let certificates = vec![
387377
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
388378
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -406,8 +396,7 @@ mod tests {
406396
#[tokio::test]
407397
async fn get_master_certificate_multiple_cert_in_penultimate_epoch_none_in_previous_returns_none(
408398
) {
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());
411400
let certificates = vec![
412401
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
413402
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -427,8 +416,7 @@ mod tests {
427416
#[tokio::test]
428417
async fn get_master_certificate_second_genesis_after_multiple_cert_in_current_epoch_returns_last_genesis(
429418
) {
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());
432420
let certificates = vec![
433421
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
434422
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -451,8 +439,7 @@ mod tests {
451439
#[tokio::test]
452440
async fn get_master_certificate_second_genesis_after_multiple_cert_in_multiple_epochs_returns_last_genesis(
453441
) {
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());
456443
let certificates = vec![
457444
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
458445
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -477,8 +464,7 @@ mod tests {
477464
#[tokio::test]
478465
async fn get_master_certificate_new_genesis_after_multiple_cert_in_previous_epoch_returns_last_genesis(
479466
) {
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());
482468
let certificates = vec![
483469
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
484470
CertificateRecord::dummy_db_snapshot("2", "1", Epoch(1), 2),
@@ -503,8 +489,7 @@ mod tests {
503489
let (certificates, _) = setup_certificate_chain(3, 1);
504490
let expected_certificate_id = &certificates[2].hash;
505491
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());
508493
insert_certificate_records(&connection, certificates.clone());
509494

510495
let repository: CertificateRepository = CertificateRepository::new(connection);
@@ -520,17 +505,15 @@ mod tests {
520505
#[tokio::test]
521506
async fn save_certificate() {
522507
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());
526510
let certificate = repository
527511
.create_certificate(certificates[4].clone())
528512
.await
529513
.unwrap();
530514

531515
assert_eq!(certificates[4].hash, certificate.hash);
532516
{
533-
let connection = deps.get_sqlite_connection().await.unwrap();
534517
let cert = connection
535518
.fetch_first(GetCertificateRecordQuery::by_certificate_id(
536519
&certificates[4].hash,
@@ -544,8 +527,7 @@ mod tests {
544527

545528
#[tokio::test]
546529
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());
549531
let repository = CertificateRepository::new(connection.clone());
550532
let records = vec![
551533
CertificateRecord::dummy_genesis("1", Epoch(1), 1),

0 commit comments

Comments
 (0)