Skip to content

Commit 9c1bede

Browse files
authored
Merge pull request #1226 from input-output-hk/damien/798/implement-anyhow-for-signable-builder
Implement anyhow context for signable_builder
2 parents d393eab + 4cac259 commit 9c1bede

File tree

7 files changed

+25
-18
lines changed

7 files changed

+25
-18
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
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.85"
3+
version = "0.3.86"
44
description = "A Mithril Aggregator server"
55
authors = { workspace = true }
66
edition = { workspace = true }

mithril-aggregator/src/runtime/runner.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,8 @@ impl AggregatorRunnerTrait for AggregatorRunner {
363363
.dependencies
364364
.signable_builder_service
365365
.compute_protocol_message(signed_entity_type.to_owned())
366-
.await?;
366+
.await
367+
.with_context(|| format!("Runner can not compute protocol message for signed entity type: '{signed_entity_type}'"))?;
367368

368369
let multi_signer = self.dependencies.multi_signer.write().await;
369370
protocol_message.set_message_part(

mithril-common/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-common"
3-
version = "0.2.108"
3+
version = "0.2.109"
44
authors = { workspace = true }
55
edition = { workspace = true }
66
documentation = { workspace = true }

mithril-common/src/signable_builder/signable_builder_service.rs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use anyhow::Context;
12
use async_trait::async_trait;
23
use std::sync::Arc;
34

@@ -47,16 +48,20 @@ impl SignableBuilderService for MithrilSignableBuilderService {
4748
signed_entity_type: SignedEntityType,
4849
) -> StdResult<ProtocolMessage> {
4950
let protocol_message = match signed_entity_type {
50-
SignedEntityType::MithrilStakeDistribution(e) => {
51-
self.mithril_stake_distribution_builder
52-
.compute_protocol_message(e)
53-
.await?
54-
}
55-
SignedEntityType::CardanoImmutableFilesFull(beacon) => {
56-
self.immutable_signable_builder
57-
.compute_protocol_message(beacon)
58-
.await?
59-
}
51+
SignedEntityType::MithrilStakeDistribution(e) => self
52+
.mithril_stake_distribution_builder
53+
.compute_protocol_message(e)
54+
.await
55+
.with_context(|| format!(
56+
"Signable builder service can not compute protocol message with epoch: '{e}'"
57+
))?,
58+
SignedEntityType::CardanoImmutableFilesFull(beacon) => self
59+
.immutable_signable_builder
60+
.compute_protocol_message(beacon.clone())
61+
.await
62+
.with_context(|| format!(
63+
"Signable builder service can not compute protocol message with beacon: '{beacon}'"
64+
))?,
6065
SignedEntityType::CardanoStakeDistribution(_) => todo!(),
6166
};
6267

mithril-signer/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-signer"
3-
version = "0.2.75"
3+
version = "0.2.76"
44
description = "A Mithril Signer"
55
authors = { workspace = true }
66
edition = { workspace = true }

mithril-signer/src/runtime/runner.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@ impl Runner for SignerRunner {
332332
.services
333333
.signable_builder_service
334334
.compute_protocol_message(signed_entity_type.to_owned())
335-
.await?;
335+
.await
336+
.with_context(|| format!("Runner can not compute protocol message for signed entity type: '{signed_entity_type}'"))?;
336337

337338
// 2 set the next signers keys and stakes in the message
338339
let epoch = signed_entity_type.get_epoch();

0 commit comments

Comments
 (0)