Fix #2172.

Author: AurelienFT

massa-client/src/cmds.rs

@@ -471,11 +471,11 @@ impl Command {
                 let mut res = "".to_string();
                 for key in parse_vec::<Address>(parameters)?.into_iter() {
                     match wallet.remove_address(key) {
-                        Some(_) => {
+                        Ok(_) => {
                             res.push_str(&format!("Removed address {} from the wallet\n", key));
                         }
-                        None => {
-                            res.push_str(&format!("Address {} wasn't in the wallet\n", key));
+                        Err(err) => {
+                            res.push_str(&err.to_string());
                         }
                     }
                 }

massa-wallet/src/lib.rs

@@ -77,8 +77,9 @@ impl Wallet {
         }
     }
 
-    pub fn remove_address(&mut self, address: Address) -> Option<(PublicKey, PrivateKey)> {
-        self.keys.remove(&address)
+    pub fn remove_address(&mut self, address: Address) -> Result<(), WalletError> {
+        self.keys.remove(&address).ok_or(WalletError::MissingKeyError(address))?;
+        self.save()
     }
 
     /// Finds the private key associated with given address