Handle keyring specific errors in keyring.rs

Author: elizabethengelman

cmd/soroban-cli/src/config/locator.rs

@@ -302,19 +302,10 @@ impl Args {
 
         if let Key::Secret(Secret::SecureStore { entry_name }) = identity {
             let entry = StellarEntry::new(&entry_name)?;
-            match entry.delete_seed_phrase() {
-                Ok(()) => {}
-                Err(e) => match e {
-                    signer::keyring::Error::Keyring(keyring::Error::NoEntry) => {
-                        print.infoln("This key was already removed from the secure store. Removing the cli config file.");
-                    }
-                    _ => {
-                        return Err(Error::Keyring(e));
-                    }
-                },
-            }
+            entry.delete_seed_phrase(&print)?;
         }
 
+        print.infoln("Removing the key's cli config file");
         KeyType::Identity.remove(name, &self.config_dir()?)
     }
 

cmd/soroban-cli/src/signer/keyring.rs

@@ -66,9 +66,23 @@ impl StellarEntry {
         return Err(Error::FeatureNotEnabled);
     }
 
-    pub fn delete_seed_phrase(&self) -> Result<(), Error> {
+    pub fn delete_seed_phrase(&self, print: &Print) -> Result<(), Error> {
         #[cfg(feature = "additional-libs")]
-        return Ok(self.keyring.delete_credential()?);
+        {
+            return match self.keyring.delete_credential() {
+                Ok(()) => Ok(()),
+                Err(e) => match e {
+                    keyring::Error::NoEntry => {
+                        print.infoln("This key was already removed from the secure store.");
+                        Ok(())
+                    }
+                    _ => {
+                       Err(Error::Keyring(e.into()))
+                    }
+                }
+
+            }
+        }
 
         return Err(Error::FeatureNotEnabled);
     }