clippy warnings

tari-project · Mar 13, 2024 · ac183a1 · ac183a1
1 parent 6166310
commit ac183a1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_console_wallet/src/init/mod.rs b/applications/minotari_console_wallet/src/init/mod.rs
@@ -811,11 +811,11 @@ pub(crate) fn boot_with_password(
 }
 
 pub fn prompt_wallet_type(
-    boot_mode: &WalletBoot,
+    boot_mode: WalletBoot,
     wallet_config: &WalletConfig,
-    non_interactive: &bool,
+    non_interactive: bool,
 ) -> Option<WalletType> {
-    if *non_interactive {
+    if non_interactive {
         return Some(WalletType::Software);
     }
 

diff --git a/applications/minotari_console_wallet/src/lib.rs b/applications/minotari_console_wallet/src/lib.rs
@@ -126,10 +126,10 @@ pub fn run_wallet_with_cli(
     // check for recovery based on existence of wallet file
     let (mut boot_mode, password) = boot_with_password(&cli, &config.wallet)?;
 
-    let recovery_seed = get_recovery_seed(&boot_mode, &cli)?;
+    let recovery_seed = get_recovery_seed(boot_mode, &cli)?;
 
     // This is deactivated at the moment as full support is not yet complete
-    let wallet_type = prompt_wallet_type(&boot_mode, &config.wallet, &cli.non_interactive_mode);
+    let wallet_type = prompt_wallet_type(boot_mode, &config.wallet, cli.non_interactive_mode);
 
     // get command line password if provided
     let seed_words_file_name = cli.seed_words_file_name.clone();
@@ -256,7 +256,7 @@ fn get_password(config: &ApplicationConfig, cli: &Cli) -> Option<SafePassword> {
         .map(|s| s.to_owned())
 }
 
-fn get_recovery_seed(boot_mode: &WalletBoot, cli: &Cli) -> Result<Option<CipherSeed>, ExitError> {
+fn get_recovery_seed(boot_mode: WalletBoot, cli: &Cli) -> Result<Option<CipherSeed>, ExitError> {
     if matches!(boot_mode, WalletBoot::Recovery) {
         let seed = if let Some(ref seed_words) = cli.seed_words {
             get_seed_from_seed_words(seed_words)?

diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -20,6 +20,7 @@ once_cell = "1.8.0"
 rand = "0.8"
 serde = { version = "1.0.106", features = ["derive"] }
 strum = "0.22"
+strum_macros = "0.22"
 thiserror = "1.0.29"
 base64 = "0.21.0"
 blake2 = "0.10"

diff --git a/base_layer/common_types/src/wallet_types.rs b/base_layer/common_types/src/wallet_types.rs
@@ -26,7 +26,7 @@ use std::{
 };
 
 use serde::{Deserialize, Serialize};
-use strum::EnumString;
+use strum_macros::EnumString;
 
 #[derive(Debug, EnumString, Clone, Copy, Serialize, Deserialize)]
 pub enum WalletType {