Skip to content

Commit 1111de0

Browse files
committed
refactor(aggregator): dispatch root logger when building dependencies
1 parent 3581261 commit 1111de0

File tree

13 files changed

+103
-90
lines changed

13 files changed

+103
-90
lines changed

mithril-aggregator/src/commands/genesis_command.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ impl ExportGenesisSubCommand {
8686
"Genesis export payload to sign to {}",
8787
self.target_path.display()
8888
);
89-
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
89+
let mut dependencies_builder =
90+
DependenciesBuilder::new(root_logger.clone(), config.clone());
9091
let dependencies = dependencies_builder
9192
.create_genesis_container()
9293
.await
@@ -127,7 +128,8 @@ impl ImportGenesisSubCommand {
127128
"Genesis import signed payload from {}",
128129
self.signed_payload_path.to_string_lossy()
129130
);
130-
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
131+
let mut dependencies_builder =
132+
DependenciesBuilder::new(root_logger.clone(), config.clone());
131133
let dependencies = dependencies_builder
132134
.create_genesis_container()
133135
.await
@@ -205,7 +207,8 @@ impl BootstrapGenesisSubCommand {
205207
.with_context(|| "configuration deserialize error")?;
206208
debug!(root_logger, "BOOTSTRAP GENESIS command"; "config" => format!("{config:?}"));
207209
println!("Genesis bootstrap for test only!");
208-
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
210+
let mut dependencies_builder =
211+
DependenciesBuilder::new(root_logger.clone(), config.clone());
209212
let dependencies = dependencies_builder
210213
.create_genesis_container()
211214
.await

mithril-aggregator/src/commands/serve_command.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ impl ServeCommand {
9292
.try_deserialize()
9393
.with_context(|| "configuration deserialize error")?;
9494
debug!(root_logger, "SERVE command"; "config" => format!("{config:?}"));
95-
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
95+
let mut dependencies_builder =
96+
DependenciesBuilder::new(root_logger.clone(), config.clone());
9697

9798
// start servers
9899
println!("Starting server...");

mithril-aggregator/src/commands/tools_command.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ impl RecomputeCertificatesHashCommand {
7373
.with_context(|| "configuration deserialize error")?;
7474
debug!(root_logger, "RECOMPUTE CERTIFICATES HASH command"; "config" => format!("{config:?}"));
7575
println!("Recomputing all certificate hash",);
76-
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
76+
let mut dependencies_builder =
77+
DependenciesBuilder::new(root_logger.clone(), config.clone());
7778
let connection = dependencies_builder
7879
.get_sqlite_connection()
7980
.await

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ mod tests {
239239
async fn repository_get_certificate() {
240240
let (certificates, _) = setup_certificate_chain(5, 2);
241241
let expected_hash = certificates[0].hash.clone();
242-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
242+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
243243
let connection = deps.get_sqlite_connection().await.unwrap();
244244
insert_certificate_records(&connection, certificates.clone());
245245

@@ -262,7 +262,7 @@ mod tests {
262262
#[tokio::test]
263263
async fn repository_get_latest_certificates() {
264264
let (certificates, _) = setup_certificate_chain(5, 2);
265-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
265+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
266266
let connection = deps.get_sqlite_connection().await.unwrap();
267267
insert_certificate_records(&connection, certificates.clone());
268268

@@ -278,7 +278,7 @@ mod tests {
278278

279279
#[tokio::test]
280280
async fn get_master_certificate_no_certificate_recorded_returns_none() {
281-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
281+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
282282
let connection = deps.get_sqlite_connection().await.unwrap();
283283

284284
let repository: CertificateRepository = CertificateRepository::new(connection);
@@ -292,7 +292,7 @@ mod tests {
292292

293293
#[tokio::test]
294294
async fn get_master_certificate_one_cert_in_current_epoch_recorded_returns_that_one() {
295-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
295+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
296296
let connection = deps.get_sqlite_connection().await.unwrap();
297297
let certificate = CertificateRecord::dummy_genesis("1", Epoch(1), 1);
298298
let expected_certificate: Certificate = certificate.clone().into();
@@ -311,7 +311,7 @@ mod tests {
311311
#[tokio::test]
312312
async fn get_master_certificate_multiple_cert_in_current_epoch_returns_first_of_current_epoch()
313313
{
314-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
314+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
315315
let connection = deps.get_sqlite_connection().await.unwrap();
316316
let certificates = vec![
317317
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -334,7 +334,7 @@ mod tests {
334334
#[tokio::test]
335335
async fn get_master_certificate_multiple_cert_in_previous_epoch_none_in_the_current_returns_first_of_previous_epoch(
336336
) {
337-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
337+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
338338
let connection = deps.get_sqlite_connection().await.unwrap();
339339
let certificates = vec![
340340
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -357,7 +357,7 @@ mod tests {
357357
#[tokio::test]
358358
async fn get_master_certificate_multiple_cert_in_previous_one_cert_in_current_epoch_returns_one_in_current_epoch(
359359
) {
360-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
360+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
361361
let connection = deps.get_sqlite_connection().await.unwrap();
362362
let certificates = vec![
363363
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -381,7 +381,7 @@ mod tests {
381381
#[tokio::test]
382382
async fn get_master_certificate_multiple_cert_in_previous_multiple_in_current_epoch_returns_first_of_current_epoch(
383383
) {
384-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
384+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
385385
let connection = deps.get_sqlite_connection().await.unwrap();
386386
let certificates = vec![
387387
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -406,7 +406,7 @@ mod tests {
406406
#[tokio::test]
407407
async fn get_master_certificate_multiple_cert_in_penultimate_epoch_none_in_previous_returns_none(
408408
) {
409-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
409+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
410410
let connection = deps.get_sqlite_connection().await.unwrap();
411411
let certificates = vec![
412412
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -427,7 +427,7 @@ mod tests {
427427
#[tokio::test]
428428
async fn get_master_certificate_second_genesis_after_multiple_cert_in_current_epoch_returns_last_genesis(
429429
) {
430-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
430+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
431431
let connection = deps.get_sqlite_connection().await.unwrap();
432432
let certificates = vec![
433433
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -451,7 +451,7 @@ mod tests {
451451
#[tokio::test]
452452
async fn get_master_certificate_second_genesis_after_multiple_cert_in_multiple_epochs_returns_last_genesis(
453453
) {
454-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
454+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
455455
let connection = deps.get_sqlite_connection().await.unwrap();
456456
let certificates = vec![
457457
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -477,7 +477,7 @@ mod tests {
477477
#[tokio::test]
478478
async fn get_master_certificate_new_genesis_after_multiple_cert_in_previous_epoch_returns_last_genesis(
479479
) {
480-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
480+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
481481
let connection = deps.get_sqlite_connection().await.unwrap();
482482
let certificates = vec![
483483
CertificateRecord::dummy_genesis("1", Epoch(1), 1),
@@ -503,7 +503,7 @@ mod tests {
503503
let (certificates, _) = setup_certificate_chain(3, 1);
504504
let expected_certificate_id = &certificates[2].hash;
505505
let epoch = &certificates[2].epoch;
506-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
506+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
507507
let connection = deps.get_sqlite_connection().await.unwrap();
508508
insert_certificate_records(&connection, certificates.clone());
509509

@@ -520,7 +520,7 @@ mod tests {
520520
#[tokio::test]
521521
async fn save_certificate() {
522522
let (certificates, _) = setup_certificate_chain(5, 3);
523-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
523+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
524524
let connection = deps.get_sqlite_connection().await.unwrap();
525525
let repository: CertificateRepository = CertificateRepository::new(connection);
526526
let certificate = repository
@@ -544,7 +544,7 @@ mod tests {
544544

545545
#[tokio::test]
546546
async fn delete_only_given_certificates() {
547-
let mut deps = DependenciesBuilder::new(Configuration::new_sample());
547+
let mut deps = DependenciesBuilder::new_for_test(Configuration::new_sample());
548548
let connection = deps.get_sqlite_connection().await.unwrap();
549549
let repository = CertificateRepository::new(connection.clone());
550550
let records = vec![

0 commit comments

Comments
 (0)