From 691d98d29664f030feb9a5909d66918fbc6f6ae0 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Tue, 7 Mar 2023 12:29:30 +0100
Subject: [PATCH] bin: Apply linter suggestions.

---
 bin/drk/src/cli_util.rs     |  2 +-
 bin/drk/src/main.rs         | 14 ++++----------
 bin/drk/src/rpc_dao.rs      |  2 +-
 bin/drk/src/wallet_dao.rs   |  2 +-
 bin/drk/src/wallet_money.rs | 10 ++++------
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/bin/drk/src/cli_util.rs b/bin/drk/src/cli_util.rs
index 0e0e90353..e6e4c42ef 100644
--- a/bin/drk/src/cli_util.rs
+++ b/bin/drk/src/cli_util.rs
@@ -78,7 +78,7 @@ pub async fn kaching() -> Result<()> {
             f.write_all(WALLET_MP3).await?;
         }
 
-        if let Err(_) = play::play(MP3_DROP) {
+        if play::play(MP3_DROP).is_err() {
             return Ok(())
         }
     }
diff --git a/bin/drk/src/main.rs b/bin/drk/src/main.rs
index d34bb7ce0..a8aebb8f7 100644
--- a/bin/drk/src/main.rs
+++ b/bin/drk/src/main.rs
@@ -634,25 +634,19 @@ async fn main() -> Result<()> {
                     };
 
                     let spend_hook = if coin.0.note.spend_hook != zero {
-                        format!(
-                            "{}",
-                            bs58::encode(&serialize(&coin.0.note.spend_hook)).into_string()
-                        )
+                        bs58::encode(&serialize(&coin.0.note.spend_hook)).into_string().to_string()
                     } else {
                         String::from("-")
                     };
 
                     let user_data = if coin.0.note.user_data != zero {
-                        format!(
-                            "{}",
-                            bs58::encode(&serialize(&coin.0.note.user_data)).into_string()
-                        )
+                        bs58::encode(&serialize(&coin.0.note.user_data)).into_string().to_string()
                     } else {
                         String::from("-")
                     };
 
                     table.add_row(row![
-                        format!("{}", bs58::encode(&serialize(&coin.0.coin.inner())).into_string()),
+                        bs58::encode(&serialize(&coin.0.coin.inner())).into_string().to_string(),
                         coin.1,
                         coin.0.note.token_id,
                         aliases,
@@ -948,7 +942,7 @@ async fn main() -> Result<()> {
                     println!("{}", table);
                 }
 
-                return Ok(())
+                Ok(())
             }
 
             DaoSubcmd::Mint { dao_id } => {
diff --git a/bin/drk/src/rpc_dao.rs b/bin/drk/src/rpc_dao.rs
index dc998aa10..ed459e2e8 100644
--- a/bin/drk/src/rpc_dao.rs
+++ b/bin/drk/src/rpc_dao.rs
@@ -240,7 +240,7 @@ impl Drk {
         let calls = vec![ContractCall { contract_id: *DAO_CONTRACT_ID, data }];
         let proofs = vec![proofs];
         let mut tx = Transaction { calls, proofs, signatures: vec![] };
-        let sigs = tx.create_sigs(&mut OsRng, &vec![signature_secret])?;
+        let sigs = tx.create_sigs(&mut OsRng, &[signature_secret])?;
         tx.signatures = vec![sigs];
 
         Ok(tx)
diff --git a/bin/drk/src/wallet_dao.rs b/bin/drk/src/wallet_dao.rs
index 726ab217d..4544f2dc5 100644
--- a/bin/drk/src/wallet_dao.rs
+++ b/bin/drk/src/wallet_dao.rs
@@ -427,7 +427,7 @@ impl Drk {
     pub async fn import_dao(&self, dao_name: String, dao_params: DaoParams) -> Result<()> {
         // First let's check if we've imported this DAO with the given name before.
         let daos = self.get_daos().await?;
-        if daos.iter().find(|x| x.name == dao_name).is_some() {
+        if daos.iter().any(|x| x.name == dao_name) {
             return Err(anyhow!("This DAO has already been imported"))
         }
 
diff --git a/bin/drk/src/wallet_money.rs b/bin/drk/src/wallet_money.rs
index 7343f2e0a..55ecac3aa 100644
--- a/bin/drk/src/wallet_money.rs
+++ b/bin/drk/src/wallet_money.rs
@@ -560,7 +560,7 @@ impl Drk {
                     let leaf_position = tree.witness().unwrap();
 
                     let owncoin = OwnCoin {
-                        coin: Coin::from(coin),
+                        coin,
                         note: note.clone(),
                         secret: *secret,
                         nullifier: Nullifier::from(poseidon_hash([secret.inner(), note.serial])),
@@ -649,10 +649,8 @@ impl Drk {
             let _ = self.rpc_client.request(req).await?;
         }
 
-        if !owncoins.is_empty() {
-            if let Err(_) = kaching().await {
-                return Ok(())
-            }
+        if !owncoins.is_empty() && (kaching().await).is_err() {
+            return Ok(())
         }
 
         Ok(())
@@ -773,7 +771,7 @@ impl Drk {
         if input.chars().count() <= 5 {
             let aliases = self.get_aliases(Some(input.clone()), None).await?;
             if let Some(token_id) = aliases.get(&input) {
-                return Ok(token_id.clone())
+                return Ok(*token_id)
             }
         }
         // Else parse input