Skip to content

Commit d2073d6

Browse files
authored
Merge pull request #1237 from input-output-hk/damien/798/implement-anyhow-context-for-aggregator-dependency-injection
Implement anyhow context: dependency_injection
2 parents 93d84ec + dca332c commit d2073d6

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mithril-aggregator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mithril-aggregator"
3-
version = "0.3.92"
3+
version = "0.3.93"
44
description = "A Mithril Aggregator server"
55
authors = { workspace = true }
66
edition = { workspace = true }

mithril-aggregator/src/commands/genesis_command.rs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ impl ExportGenesisSubCommand {
7373
self.target_path.display()
7474
);
7575
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
76-
let dependencies = dependencies_builder.create_genesis_container().await?;
76+
let dependencies = dependencies_builder
77+
.create_genesis_container()
78+
.await
79+
.with_context(|| {
80+
"Dependencies Builder can not create genesis command dependencies container"
81+
})?;
7782

7883
let genesis_tools = GenesisTools::from_dependencies(dependencies)
7984
.await
@@ -105,7 +110,12 @@ impl ImportGenesisSubCommand {
105110
self.signed_payload_path.to_string_lossy()
106111
);
107112
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
108-
let dependencies = dependencies_builder.create_genesis_container().await?;
113+
let dependencies = dependencies_builder
114+
.create_genesis_container()
115+
.await
116+
.with_context(|| {
117+
"Dependencies Builder can not create genesis command dependencies container"
118+
})?;
109119

110120
let genesis_tools = GenesisTools::from_dependencies(dependencies)
111121
.await
@@ -170,7 +180,12 @@ impl BootstrapGenesisSubCommand {
170180
debug!("BOOTSTRAP GENESIS command"; "config" => format!("{config:?}"));
171181
println!("Genesis bootstrap for test only!");
172182
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
173-
let dependencies = dependencies_builder.create_genesis_container().await?;
183+
let dependencies = dependencies_builder
184+
.create_genesis_container()
185+
.await
186+
.with_context(|| {
187+
"Dependencies Builder can not create genesis command dependencies container"
188+
})?;
174189

175190
let genesis_tools = GenesisTools::from_dependencies(dependencies)
176191
.await

mithril-aggregator/src/commands/serve_command.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ impl ServeCommand {
8888
println!("Press Ctrl+C to stop");
8989

9090
// start the monitoring thread
91-
let mut event_store = dependencies_builder.create_event_store().await?;
91+
let mut event_store = dependencies_builder
92+
.create_event_store()
93+
.await
94+
.with_context(|| "Dependencies Builder can not create event store")?;
9295
let event_store_config = config.clone();
9396
let event_store_thread = tokio::spawn(async move {
9497
event_store
@@ -102,13 +105,19 @@ impl ServeCommand {
102105
});
103106

104107
// start the aggregator runtime
105-
let mut runtime = dependencies_builder.create_aggregator_runner().await?;
108+
let mut runtime = dependencies_builder
109+
.create_aggregator_runner()
110+
.await
111+
.with_context(|| "Dependencies Builder can not create aggregator runner")?;
106112
let mut join_set = JoinSet::new();
107113
join_set.spawn(async move { runtime.run().await.map_err(|e| e.to_string()) });
108114

109115
// start the HTTP server
110116
let (shutdown_tx, shutdown_rx) = oneshot::channel();
111-
let routes = dependencies_builder.create_http_routes().await?;
117+
let routes = dependencies_builder
118+
.create_http_routes()
119+
.await
120+
.with_context(|| "Dependencies Builder can not create http routes")?;
112121
join_set.spawn(async move {
113122
let (_, server) = warp::serve(routes).bind_with_graceful_shutdown(
114123
(

mithril-aggregator/src/commands/tools_command.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ impl RecomputeCertificatesHashCommand {
6060
debug!("RECOMPUTE CERTIFICATES HASH command"; "config" => format!("{config:?}"));
6161
println!("Recomputing all certificate hash",);
6262
let mut dependencies_builder = DependenciesBuilder::new(config.clone());
63-
let connection = dependencies_builder.get_sqlite_connection().await?;
63+
let connection = dependencies_builder
64+
.get_sqlite_connection()
65+
.await
66+
.with_context(|| "Dependencies Builder can not get sqlite connection")?;
6467
let migrator = CertificatesHashMigrator::new(
6568
CertificateRepository::new(connection.clone()),
6669
Arc::new(SignedEntityStoreAdapter::new(connection.clone())),

0 commit comments

Comments
 (0)