Merge pull request #1398 from input-output-hk/damien/fix-mithril-clie…

…nt-cli-genesis-verification-key-missing Fix breaking change introduced with `mithril-client-cli` using `mithril-client` library
input-output-hk · Dec 14, 2023 · 84308dd · 84308dd
2 parents 2670a43 + 9acc854
commit 84308dd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mithril-client-cli/Cargo.toml b/mithril-client-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client-cli"
-version = "0.5.9"
+version = "0.5.10"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/mithril-client-cli/src/commands/mithril_stake_distribution/list.rs b/mithril-client-cli/src/commands/mithril_stake_distribution/list.rs
@@ -6,7 +6,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use mithril_client::ClientBuilder;
 use mithril_client_cli::configuration::ConfigParameters;
-use mithril_common::StdResult;
+use mithril_common::{test_utils::fake_keys, StdResult};
 
 /// Mithril stake distribution LIST command
 #[derive(Parser, Debug, Clone)]
@@ -23,9 +23,16 @@ impl MithrilStakeDistributionListCommand {
         let params = Arc::new(ConfigParameters::new(
             config.try_deserialize::<HashMap<String, String>>()?,
         ));
+        // TODO: This should not be done this way.
+        // Now that mithril-client-cli uses the mithril-client library, the genesis verification key is required for all commands
+        let fallback_genesis_verification_key =
+            fake_keys::genesis_verification_key()[0].to_string();
         let client = ClientBuilder::aggregator(
             &params.require("aggregator_endpoint")?,
-            &params.require("genesis_verification_key")?,
+            &params.get_or(
+                "genesis_verification_key",
+                &fallback_genesis_verification_key,
+            ),
         )
         .with_logger(logger())
         .build()?;

diff --git a/mithril-client-cli/src/commands/snapshot/list.rs b/mithril-client-cli/src/commands/snapshot/list.rs
@@ -1,6 +1,7 @@
 use clap::Parser;
 use cli_table::{format::Justify, print_stdout, Cell, Table};
 use config::{builder::DefaultState, ConfigBuilder};
+use mithril_common::test_utils::fake_keys;
 use slog_scope::logger;
 use std::{collections::HashMap, sync::Arc};
 
@@ -22,9 +23,16 @@ impl SnapshotListCommand {
         let params = Arc::new(ConfigParameters::new(
             config.try_deserialize::<HashMap<String, String>>()?,
         ));
+        // TODO: This should not be done this way.
+        // Now that mithril-client-cli uses the mithril-client library, the genesis verification key is required for all commands
+        let fallback_genesis_verification_key =
+            fake_keys::genesis_verification_key()[0].to_string();
         let client = ClientBuilder::aggregator(
             &params.require("aggregator_endpoint")?,
-            &params.require("genesis_verification_key")?,
+            &params.get_or(
+                "genesis_verification_key",
+                &fallback_genesis_verification_key,
+            ),
         )
         .with_logger(logger())
         .build()?;

diff --git a/mithril-client-cli/src/commands/snapshot/show.rs b/mithril-client-cli/src/commands/snapshot/show.rs
@@ -7,7 +7,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use mithril_client::ClientBuilder;
 use mithril_client_cli::{configuration::ConfigParameters, utils::ExpanderUtils};
-use mithril_common::StdResult;
+use mithril_common::{test_utils::fake_keys, StdResult};
 
 /// Clap command to show a given snapshot
 #[derive(Parser, Debug, Clone)]
@@ -29,9 +29,16 @@ impl SnapshotShowCommand {
         let params = Arc::new(ConfigParameters::new(
             config.try_deserialize::<HashMap<String, String>>()?,
         ));
+        // TODO: This should not be done this way.
+        // Now that mithril-client-cli uses the mithril-client library, the genesis verification key is required for all commands
+        let fallback_genesis_verification_key =
+            fake_keys::genesis_verification_key()[0].to_string();
         let client = ClientBuilder::aggregator(
             &params.require("aggregator_endpoint")?,
-            &params.require("genesis_verification_key")?,
+            &params.get_or(
+                "genesis_verification_key",
+                &fallback_genesis_verification_key,
+            ),
         )
         .with_logger(logger())
         .build()?;