Skip to content

Commit e2e2b0e

Browse files
committed
refactor: enhance use of aliases in ImmutableDigester
- use `StdError` alias instead of `anyhow::Error` - remove unnecessary `ComputedImmutablesDigestsResult` alias
1 parent c0cd4c3 commit e2e2b0e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

mithril-common/src/digesters/cardano_immutable_digester.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ use sha2::{Digest, Sha256};
1212
use slog::{debug, info, warn, Logger};
1313
use std::{collections::BTreeMap, io, path::Path, sync::Arc};
1414

15-
/// Result of a cache computation, contains the list of immutable digests and the list of new entries to add
16-
/// to the [ImmutableFileDigestCacheProvider].
17-
type ComputedImmutablesDigestsResult = Result<ComputedImmutablesDigests, io::Error>;
18-
1915
struct ComputedImmutablesDigests {
2016
entries: BTreeMap<ImmutableFile, HexEncodedDigest>,
2117
new_cached_entries: Vec<ImmutableFileName>,
@@ -67,7 +63,7 @@ impl CardanoImmutableDigester {
6763
// The computation of immutable files digests is done in a separate thread because it is blocking the whole task
6864
let logger = self.logger.clone();
6965
let computed_digests =
70-
tokio::task::spawn_blocking(move || -> ComputedImmutablesDigestsResult {
66+
tokio::task::spawn_blocking(move || -> Result<ComputedImmutablesDigests, io::Error> {
7167
compute_immutables_digests(logger, cached_values)
7268
})
7369
.await
@@ -183,7 +179,7 @@ fn list_immutable_files_to_process(
183179
fn compute_immutables_digests(
184180
logger: Logger,
185181
entries: BTreeMap<ImmutableFile, Option<HexEncodedDigest>>,
186-
) -> ComputedImmutablesDigestsResult {
182+
) -> Result<ComputedImmutablesDigests, io::Error> {
187183
let mut new_cached_entries = Vec::new();
188184
let mut progress = Progress {
189185
index: 0,

mithril-common/src/digesters/immutable_digester.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use crate::{
22
crypto_helper::{MKTree, MKTreeStoreInMemory},
33
digesters::ImmutableFileListingError,
44
entities::{CardanoDbBeacon, ImmutableFileNumber},
5+
StdError,
56
};
67
use async_trait::async_trait;
78
use std::{
@@ -89,5 +90,5 @@ pub enum ImmutableDigesterError {
8990

9091
/// Error raised when the Merkle tree computation failed.
9192
#[error("Merkle tree computation failed")]
92-
MerkleTreeComputationError(anyhow::Error),
93+
MerkleTreeComputationError(StdError),
9394
}

0 commit comments

Comments
 (0)