Cleanup clippy and fmt

Author: elizabethengelman

cmd/soroban-cli/src/commands/keys/add.rs

@@ -81,7 +81,7 @@ impl Cmd {
 
             let seed_phrase: SeedPhrase = secret_key.parse()?;
 
-            let secret = secure_store::save_secret(print, &self.name, seed_phrase)?;
+            let secret = secure_store::save_secret(print, &self.name, &seed_phrase)?;
             Ok(secret.parse()?)
         } else {
             let prompt = "Type a secret key or 12/24 word seed phrase:";

cmd/soroban-cli/src/commands/keys/generate.rs

@@ -127,7 +127,7 @@ impl Cmd {
     fn secret(&self, print: &Print) -> Result<Secret, Error> {
         let seed_phrase = self.seed_phrase()?;
         if self.secure_store {
-            let secret = secure_store::save_secret(print, &self.name, seed_phrase)?;
+            let secret = secure_store::save_secret(print, &self.name, &seed_phrase)?;
             Ok(secret.parse()?)
         } else if self.as_secret {
             let secret: Secret = seed_phrase.into();
@@ -215,7 +215,6 @@ mod tests {
         assert!(matches!(identity, Key::Secret(Secret::SecureStore { .. })));
     }
 
-
     #[tokio::test]
     async fn test_storing_in_secure_store_returns_error_when_additional_libs_not_enabled() {
         let (test_locator, mut cmd) = set_up_test();

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

@@ -1,7 +1,7 @@
+use crate::print::Print;
 use ed25519_dalek::Signer;
 use sep5::seed_phrase::SeedPhrase;
 use zeroize::Zeroize;
-use crate::print::Print;
 
 use keyring::Entry;
 
@@ -36,10 +36,12 @@ impl StellarEntry {
         if let Ok(key) = self.get_public_key(None) {
             print.warnln(format!(
                 "A key for {0} already exists in your operating system's secure store: {1}",
-            self.name, key));
+                self.name, key
+            ));
         } else {
             print.infoln(format!(
-                "Saving a new key to your operating system's secure store: {0}", self.name
+                "Saving a new key to your operating system's secure store: {0}",
+                self.name
             ));
             self.set_seed_phrase(seed_phrase)?;
         };
@@ -62,11 +64,8 @@ impl StellarEntry {
                     print.infoln("This key was already removed from the secure store.");
                     Ok(())
                 }
-                _ => {
-                    Err(Error::Keyring(e.into()))
-                }
-            }
-
+                _ => Err(Error::Keyring(e)),
+            },
         }
     }
 

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

@@ -379,7 +379,9 @@ pub struct SecureStoreEntry {
 
 impl SecureStoreEntry {
     pub fn sign_tx_hash(&self, tx_hash: [u8; 32]) -> Result<DecoratedSignature, Error> {
-        let hint = SignatureHint(secure_store::get_public_key(&self.name, self.hd_path)?.0[28..].try_into()?);
+        let hint = SignatureHint(
+            secure_store::get_public_key(&self.name, self.hd_path)?.0[28..].try_into()?,
+        );
 
         let signed_tx_hash = secure_store::sign_tx_data(&self.name, self.hd_path, &tx_hash)?;
 

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

@@ -28,92 +28,68 @@ pub enum Error {
 
 #[cfg(feature = "additional-libs")]
 mod secure_store_impl {
-    use super::*;
+    use super::{Error, Print, PublicKey, SeedPhrase, StellarEntry, ENTRY_PREFIX};
     const ENTRY_SERVICE: &str = "org.stellar.cli";
 
-    pub fn get_public_key(
-        entry_name: &str,
-        index: Option<usize>,
-    ) -> Result<PublicKey, Error> {
+    pub fn get_public_key(entry_name: &str, index: Option<usize>) -> Result<PublicKey, Error> {
         let entry = StellarEntry::new(entry_name)?;
         Ok(entry.get_public_key(index)?)
     }
-    
-    pub fn delete_secret(
-        print: &Print,
-        entry_name: &str,
-    ) -> Result<(), Error> {
+
+    pub fn delete_secret(print: &Print, entry_name: &str) -> Result<(), Error> {
         let entry = StellarEntry::new(entry_name)?;
-        entry.delete_seed_phrase(print)?;
-    
-        Ok(())
+        Ok(entry.delete_seed_phrase(print)?)
     }
-    
+
     pub fn save_secret(
         print: &Print,
         entry_name: &str,
-        seed_phrase: SeedPhrase,
+        seed_phrase: &SeedPhrase,
     ) -> Result<String, Error> {
         // secure_store:org.stellar.cli:<key name>
-        let entry_name_with_prefix = format!(
-            "{}{}-{}",
-            ENTRY_PREFIX,
-            ENTRY_SERVICE,
-            entry_name
-        );
-
-        //checking that the entry name is valid before writing to the secure store
-        // let secret = entry_name_with_prefix.parse()?;
-        // without this, we end up saving to the keychain without verifying that it is a valid secret name. FIXME
+        let entry_name_with_prefix = format!("{ENTRY_PREFIX}{ENTRY_SERVICE}-{entry_name}");
 
         let entry = StellarEntry::new(&entry_name_with_prefix)?;
-        entry.write(seed_phrase, print)?;
+        entry.write(seed_phrase.clone(), print)?;
 
-        return Ok(entry_name_with_prefix)
+        Ok(entry_name_with_prefix)
     }
-    
+
     pub fn sign_tx_data(
         entry_name: &str,
         hd_path: Option<usize>,
         data: &[u8],
     ) -> Result<Vec<u8>, Error> {
         let entry = StellarEntry::new(entry_name)?;
-        return Ok(entry.sign_data(data, hd_path)?)
+        Ok(entry.sign_data(data, hd_path)?)
     }
 }
 
 #[cfg(not(feature = "additional-libs"))]
 mod secure_store_impl {
-    use super::*;
+    use super::{Error, Print, PublicKey, SeedPhrase};
 
-    pub fn get_public_key(
-        _entry_name: &str,
-        _index: Option<usize>,
-    ) -> Result<PublicKey, Error> {
-        return Err(Error::FeatureNotEnabled);
+    pub fn get_public_key(_entry_name: &str, _index: Option<usize>) -> Result<PublicKey, Error> {
+        Err(Error::FeatureNotEnabled)
     }
-    
-    pub fn delete_secret(
-        _print: &Print,
-        _entry_name: &str,
-    ) -> Result<(), Error> {
-        return Err(Error::FeatureNotEnabled);
+
+    pub fn delete_secret(_print: &Print, _entry_name: &str) -> Result<(), Error> {
+        Err(Error::FeatureNotEnabled)
     }
-    
+
     pub fn save_secret(
         _print: &Print,
         _entry_name: &str,
-        _seed_phrase: SeedPhrase,
+        _seed_phrase: &SeedPhrase,
     ) -> Result<String, Error> {
-        return Err(Error::FeatureNotEnabled);
+        Err(Error::FeatureNotEnabled)
     }
-    
+
     pub fn sign_tx_data(
         _entry_name: &str,
         _hd_path: Option<usize>,
         _data: &[u8],
     ) -> Result<Vec<u8>, Error> {
-        return Err(Error::FeatureNotEnabled);
+        Err(Error::FeatureNotEnabled)
     }
 }
-