Skip to content

Commit 4a9e9db

Browse files
committed
refactoring(client-lib,client-cli): improve name of cardano database verification result
1 parent bc12c25 commit 4a9e9db

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

mithril-client-cli/src/commands/cardano_db/verify.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use anyhow::Context;
88
use chrono::{DateTime, Utc};
99
use clap::Parser;
1010
use mithril_client::{
11-
CardanoDatabaseSnapshot, ComputeCardanoDatabaseMessageError, ImmutableFilesLists,
11+
CardanoDatabaseSnapshot, ComputeCardanoDatabaseMessageError, ImmutableVerificationResult,
1212
MithrilResult, cardano_database_client::ImmutableFileRange, common::ImmutableFileNumber,
1313
};
1414

@@ -212,7 +212,7 @@ impl CardanoDbVerifyCommand {
212212
Ok(())
213213
}
214214

215-
fn print_immutables_verification_error(lists: &ImmutableFilesLists, json_output: bool) {
215+
fn print_immutables_verification_error(lists: &ImmutableVerificationResult, json_output: bool) {
216216
let utc_now = Utc::now();
217217
let json_file_path = write_json_file_error(utc_now, lists);
218218
let error_message = "Verifying immutables files has failed";
@@ -255,7 +255,7 @@ impl CardanoDbVerifyCommand {
255255
}
256256
}
257257

258-
fn write_json_file_error(date: DateTime<Utc>, lists: &ImmutableFilesLists) -> PathBuf {
258+
fn write_json_file_error(date: DateTime<Utc>, lists: &ImmutableVerificationResult) -> PathBuf {
259259
let file_path = PathBuf::from(format!(
260260
"immutables_verification_error-{}.json",
261261
date.timestamp()

mithril-client/src/message.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ cfg_fs! {
4343

4444
/// Type containing the lists of immutable files that are missing or tampered.
4545
#[derive(Debug, PartialEq)]
46-
pub struct ImmutableFilesLists {
46+
pub struct ImmutableVerificationResult {
4747
/// The immutables files directory.
4848
pub immutables_dir: PathBuf,
4949
/// List of missing immutable files.
@@ -58,7 +58,7 @@ cfg_fs! {
5858
#[derive(Error, Debug)]
5959
pub enum ComputeCardanoDatabaseMessageError {
6060
/// Error related to the verification of immutable files.
61-
ImmutableFilesVerification(ImmutableFilesLists),
61+
ImmutableFilesVerification(ImmutableVerificationResult),
6262

6363
/// Error related to the immutable files digests computation.
6464
ImmutableFilesDigester(#[from] ImmutableDigesterError),
@@ -291,7 +291,7 @@ impl MessageBuilder {
291291
Ok(_) => (vec![], vec![]),
292292
};
293293
Err(
294-
ComputeCardanoDatabaseMessageError::ImmutableFilesVerification(ImmutableFilesLists {
294+
ComputeCardanoDatabaseMessageError::ImmutableFilesVerification(ImmutableVerificationResult {
295295
immutables_dir: Self::immutable_dir(database_dir),
296296
missing: missing_immutable_files,
297297
tampered,
@@ -600,7 +600,7 @@ mod tests {
600600

601601
assert_eq!(
602602
error_lists,
603-
ImmutableFilesLists {
603+
ImmutableVerificationResult {
604604
immutables_dir: MessageBuilder::immutable_dir(&database_dir),
605605
missing: to_vec_immutable_file_name(&files_to_remove),
606606
tampered: vec![],
@@ -687,7 +687,7 @@ mod tests {
687687
};
688688
assert_eq!(
689689
error_lists,
690-
ImmutableFilesLists {
690+
ImmutableVerificationResult {
691691
immutables_dir: MessageBuilder::immutable_dir(&database_dir),
692692
missing: vec![],
693693
tampered: to_vec_immutable_file_name(&files_to_tamper),
@@ -738,7 +738,7 @@ mod tests {
738738
};
739739
assert_eq!(
740740
error_lists,
741-
ImmutableFilesLists {
741+
ImmutableVerificationResult {
742742
immutables_dir: MessageBuilder::immutable_dir(&database_dir),
743743
missing: to_vec_immutable_file_name(&files_to_remove),
744744
tampered: to_vec_immutable_file_name(&files_to_tamper),
@@ -805,7 +805,7 @@ mod tests {
805805
};
806806
assert_eq!(
807807
error_lists,
808-
ImmutableFilesLists {
808+
ImmutableVerificationResult {
809809
immutables_dir: MessageBuilder::immutable_dir(&database_dir),
810810
missing: vec![],
811811
tampered: vec![],
@@ -844,12 +844,14 @@ mod tests {
844844
None => vec![],
845845
};
846846

847-
ComputeCardanoDatabaseMessageError::ImmutableFilesVerification(ImmutableFilesLists {
848-
immutables_dir: PathBuf::from(immutable_path),
849-
missing,
850-
tampered,
851-
non_verifiable,
852-
})
847+
ComputeCardanoDatabaseMessageError::ImmutableFilesVerification(
848+
ImmutableVerificationResult {
849+
immutables_dir: PathBuf::from(immutable_path),
850+
missing,
851+
tampered,
852+
non_verifiable,
853+
},
854+
)
853855
}
854856

855857
fn normalize_path_separators(s: &str) -> String {

0 commit comments

Comments
 (0)