refactor(client-cli, e2e): rename cardano-db download directory

Author: Clément Turmel

.github/workflows/test-client.yml

@@ -265,7 +265,7 @@ jobs:
         if: steps.aggregator_capability_unix.outputs.cardano_database_v2_enabled == 'true' || steps.aggregator_capability_windows.outputs.cardano_database_v2_enabled == 'true'
         shell: bash
         working-directory: ./bin
-        run: ./mithril-client ${{ steps.prepare.outputs.debug_level }} --origin-tag CI cardano-db verify --backend v2 --db-dir db_v2 $CARDANO_DATABASE_V2_SNAPSHOT_HASH | tee cdb-v2-verify-output.txt
+        run: ./mithril-client ${{ steps.prepare.outputs.debug_level }} --origin-tag CI cardano-db verify --backend v2 --db-dir db $CARDANO_DATABASE_V2_SNAPSHOT_HASH | tee cdb-v2-verify-output.txt
 
       - name: Cardano Database V2 Snapshot / verify Cardano node starts successfully
         if: runner.os == 'Linux' && steps.aggregator_capability_unix.outputs.cardano_database_v2_enabled == 'true'
@@ -406,7 +406,7 @@ jobs:
       - name: Cardano Database V2 Snapshot / verify immutables
         if: steps.aggregator_capability.outputs.cardano_database_v2_enabled == 'true'
         shell: bash
-        run: ${{ steps.command.outputs.mithril_client }} ${{ steps.prepare.outputs.debug_level }} --origin-tag CI cardano-db verify --backend v2 $CARDANO_DATABASE_V2_SNAPSHOT_HASH --db-dir /app/data/db_v2
+        run: ${{ steps.command.outputs.mithril_client }} ${{ steps.prepare.outputs.debug_level }} --origin-tag CI cardano-db verify --backend v2 $CARDANO_DATABASE_V2_SNAPSHOT_HASH --db-dir /app/data/db
 
   test-mithril-client-wasm:
     strategy:

mithril-client-cli/src/commands/cardano_db/download/mod.rs

@@ -16,6 +16,8 @@ use crate::{
 };
 use mithril_client::{common::ImmutableFileNumber, MithrilResult};
 
+const DB_DIRECTORY_NAME: &str = "db";
+
 /// Clap command to download a Cardano db and verify its associated certificate.
 #[derive(Parser, Debug, Clone)]
 pub struct CardanoDbDownloadCommand {

mithril-client-cli/src/commands/cardano_db/download/v1.rs

@@ -8,7 +8,10 @@ use mithril_client::{
 };
 
 use crate::{
-    commands::{cardano_db::shared_steps, client_builder, SharedArgs},
+    commands::{
+        cardano_db::{download::DB_DIRECTORY_NAME, shared_steps},
+        client_builder, SharedArgs,
+    },
     configuration::ConfigParameters,
     utils::{
         CardanoDbDownloadChecker, CardanoDbUtils, ExpanderUtils, IndicatifFeedbackReceiver,
@@ -32,7 +35,7 @@ impl PreparedCardanoDbV1Download {
 
     /// Command execution
     pub async fn execute(&self, logger: &Logger, params: ConfigParameters) -> MithrilResult<()> {
-        let db_dir = Path::new(&self.download_dir).join("db");
+        let db_dir = Path::new(&self.download_dir).join(DB_DIRECTORY_NAME);
 
         let progress_output_type = if self.is_json_output_enabled() {
             ProgressOutputType::JsonReporter

mithril-client-cli/src/commands/cardano_db/download/v2.rs

@@ -13,7 +13,10 @@ use mithril_client::{
 };
 
 use crate::{
-    commands::{cardano_db::shared_steps, client_builder, SharedArgs},
+    commands::{
+        cardano_db::{download::DB_DIRECTORY_NAME, shared_steps},
+        client_builder, SharedArgs,
+    },
     configuration::ConfigParameters,
     utils::{
         CardanoDbDownloadChecker, CardanoDbUtils, ExpanderUtils, IndicatifFeedbackReceiver,
@@ -45,7 +48,7 @@ pub(super) struct PreparedCardanoDbV2Download {
 impl PreparedCardanoDbV2Download {
     pub async fn execute(&self, logger: &Logger, params: ConfigParameters) -> MithrilResult<()> {
         let restoration_options = RestorationOptions {
-            db_dir: Path::new(&self.download_dir).join("db_v2"),
+            db_dir: Path::new(&self.download_dir).join(DB_DIRECTORY_NAME),
             immutable_file_range: shared_steps::immutable_file_range(self.start, self.end),
             download_unpack_options: DownloadUnpackOptions {
                 allow_override: self.allow_override,

mithril-test-lab/mithril-end-to-end/src/mithril/client.rs

@@ -38,6 +38,8 @@ impl CardanoDbCommand {
                 vec![
                     "download".to_string(),
                     "--include-ancillary".to_string(),
+                    "--download-dir".to_string(),
+                    "v1".to_string(),
                     digest.clone(),
                 ]
             }
@@ -73,6 +75,8 @@ impl CardanoDbV2Command {
                 vec![
                     "download".to_string(),
                     "--include-ancillary".to_string(),
+                    "--download-dir".to_string(),
+                    "v2".to_string(),
                     hash.clone(),
                 ]
             }