Resolve "Keys clean subcommand : Indicate to Structopt that the user must indicate which keypair to delete"

Closes #108 (closed)

lib/core/conf/src/keys.rs

@@ -74,13 +74,22 @@ pub fn modify_member_keys(
 /// Clear keys command
 pub fn clear_keys(network: bool, member: bool, mut key_pairs: DuniterKeyPairs) -> DuniterKeyPairs {
     if network {
-        key_pairs.network_keypair = generate_random_keypair(KeysAlgo::Ed25519);
+        match question_prompt("Clear your network keypair?", &["y", "n"]) {
+            Ok(answer) if answer == "y" => {
+                println!("Generating a new network keypair!");
+                key_pairs.network_keypair = generate_random_keypair(KeysAlgo::Ed25519);
+            }
+            _ => (),
+        }
     }
     if member {
-        key_pairs.member_keypair = None;
-    }
-    if !network && !member {
-        println!("No key was cleared. Please specify a key to clear.")
+        match question_prompt("Clear your member keypair?", &["y", "n"]) {
+            Ok(answer) if answer == "y" => {
+                println!("Deleting member keypair!");
+                key_pairs.member_keypair = None
+            }
+            _ => (),
+        }
     }
     key_pairs
 }
@@ -111,7 +120,7 @@ pub fn save_keypairs(
     Ok(())
 }
 
-fn question_prompt(question: &str, answers: Vec<String>) -> Result<String, WizardError> {
+fn question_prompt<'a>(question: &str, answers: &[&'a str]) -> Result<&'a str, WizardError> {
     let mut buf = String::new();
 
     println!("{} ({}):", question, answers.join("/"));
@@ -119,9 +128,9 @@ fn question_prompt(question: &str, answers: Vec<String>) -> Result<String, Wizar
 
     match res {
         Ok(_) => {
-            let answer = answers.into_iter().find(|x| x == buf.trim());
+            let answer = answers.iter().find(|x| **x == buf.trim());
             match answer {
-                Some(value) => Ok(value),
+                Some(&value) => Ok(value),
                 None => Err(WizardError::Canceled),
             }
         }
@@ -149,18 +158,12 @@ fn salt_password_prompt() -> Result<KeyPairEnum, WizardError> {
 
 /// The wizard key function
 pub fn key_wizard(mut key_pairs: DuniterKeyPairs) -> Result<DuniterKeyPairs, WizardError> {
-    let mut answer = question_prompt(
-        "Modify your network keypair?",
-        vec!["y".to_string(), "n".to_string()],
-    )?;
+    let mut answer = question_prompt("Modify your network keypair?", &["y", "n"])?;
     if answer == "y" {
         key_pairs.network_keypair = salt_password_prompt()?;
     }
 
-    answer = question_prompt(
-        "Modify your member keypair?",
-        vec!["y".to_string(), "n".to_string(), "d".to_string()],
-    )?;
+    answer = question_prompt("Modify your member keypair?", &["y", "n", "d"])?;
     if answer == "y" {
         key_pairs.member_keypair = Some(salt_password_prompt()?);
     } else if answer == "d" {