From 1d646e6a2775e18f7e135d8ecd0b48bc74599a5e Mon Sep 17 00:00:00 2001
From: Deirdre Connolly <deirdre@zfnd.org>
Date: Tue, 20 Oct 2020 02:26:33 -0400
Subject: [PATCH] Make Clippy happy

---
 zebra-consensus/src/lib.rs               |  1 +
 zebra-consensus/src/transaction.rs       |  1 -
 zebra-consensus/src/transaction/check.rs | 55 ++++++++++--------------
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/zebra-consensus/src/lib.rs b/zebra-consensus/src/lib.rs
index 4c87fddf..00af175d 100644
--- a/zebra-consensus/src/lib.rs
+++ b/zebra-consensus/src/lib.rs
@@ -45,6 +45,7 @@ mod parameters;
 #[allow(dead_code)] // Remove this once transaction verification is implemented
 mod primitives;
 mod script;
+#[allow(dead_code)] // Remove this once transaction verification is implemented
 mod transaction;
 
 pub mod chain;
diff --git a/zebra-consensus/src/transaction.rs b/zebra-consensus/src/transaction.rs
index aa46a5ac..2863c4e1 100644
--- a/zebra-consensus/src/transaction.rs
+++ b/zebra-consensus/src/transaction.rs
@@ -17,7 +17,6 @@ use zebra_chain::{
     parameters::NetworkUpgrade,
     primitives::{ed25519, redjubjub},
     transaction::{self, HashType, Transaction},
-    transparent::{self, Script},
 };
 
 use zebra_state as zs;
diff --git a/zebra-consensus/src/transaction/check.rs b/zebra-consensus/src/transaction/check.rs
index 0f128972..0f9c44ca 100644
--- a/zebra-consensus/src/transaction/check.rs
+++ b/zebra-consensus/src/transaction/check.rs
@@ -1,13 +1,8 @@
-use std::convert::{TryFrom, TryInto};
+use std::convert::TryFrom;
 
 use zebra_chain::{
-    amount::{self, Amount, NegativeAllowed},
-    primitives::{
-        ed25519,
-        redjubjub::{self, Binding},
-        Groth16Proof,
-    },
-    sapling::ValueCommitment,
+    amount::Amount,
+    primitives::{ed25519, Groth16Proof},
     transaction::{JoinSplitData, ShieldedData, Transaction},
 };
 
@@ -38,16 +33,16 @@ pub fn some_money_is_spent(tx: &Transaction) -> Result<(), VerifyTransactionErro
             shielded_data: Some(shielded_data),
             ..
         } => {
-            if inputs.len() > 0
+            if !inputs.is_empty()
                 || joinsplit_data.joinsplits().count() > 0
                 || shielded_data.spends().count() > 0
             {
-                return Ok(());
+                Ok(())
             } else {
-                return Err(VerifyTransactionError::NoTransfer);
+                Err(VerifyTransactionError::NoTransfer)
             }
         }
-        _ => return Err(VerifyTransactionError::WrongVersion),
+        _ => Err(VerifyTransactionError::WrongVersion),
     }
 }
 
@@ -62,18 +57,14 @@ pub fn any_coinbase_inputs_no_transparent_outputs(
     tx: &Transaction,
 ) -> Result<(), VerifyTransactionError> {
     match tx {
-        Transaction::V4 {
-            inputs, outputs, ..
-        } => {
-            if !tx.contains_coinbase_input() {
-                return Ok(());
-            } else if outputs.len() == 0 {
-                return Ok(());
+        Transaction::V4 { outputs, .. } => {
+            if !tx.contains_coinbase_input() || !outputs.is_empty() {
+                Ok(())
             } else {
-                return Err(VerifyTransactionError::NoTransfer);
+                Err(VerifyTransactionError::NoTransfer)
             }
         }
-        _ => return Err(VerifyTransactionError::WrongVersion),
+        _ => Err(VerifyTransactionError::WrongVersion),
     }
 }
 
@@ -84,12 +75,12 @@ pub fn shielded_balances_match(
     shielded_data: &ShieldedData,
     value_balance: Amount,
 ) -> Result<(), VerifyTransactionError> {
-    if shielded_data.spends().count() + shielded_data.outputs().count() != 0 {
-        return Ok(());
-    } else if i64::from(value_balance) == 0 {
-        return Ok(());
+    if (shielded_data.spends().count() + shielded_data.outputs().count() != 0)
+        || i64::from(value_balance) == 0
+    {
+        Ok(())
     } else {
-        return Err(VerifyTransactionError::BadBalance);
+        Err(VerifyTransactionError::BadBalance)
     }
 }
 
@@ -103,16 +94,14 @@ pub fn coinbase_tx_does_not_spend_shielded(tx: &Transaction) -> Result<(), Verif
             shielded_data: Some(shielded_data),
             ..
         } => {
-            if !tx.is_coinbase() {
-                return Ok(());
-            } else if joinsplit_data.joinsplits().count() == 0
-                && shielded_data.spends().count() == 0
+            if !tx.is_coinbase()
+                || (joinsplit_data.joinsplits().count() == 0 && shielded_data.spends().count() == 0)
             {
-                return Ok(());
+                Ok(())
             } else {
-                return Err(VerifyTransactionError::Coinbase);
+                Err(VerifyTransactionError::Coinbase)
             }
         }
-        _ => return Err(VerifyTransactionError::WrongVersion),
+        _ => Err(VerifyTransactionError::WrongVersion),
     }
 }