From 27defb871126603ab025333a00e5aac4d6835f18 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 16 Feb 2024 10:59:29 -0700
Subject: [PATCH] Address comments from code review.

---
 zcash_client_backend/src/data_api/wallet.rs | 22 ++++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index ab32f2683..a22398adb 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -855,18 +855,15 @@ where
     #[cfg(feature = "orchard")]
     let orchard_internal_ovk = || {
         #[cfg(feature = "transparent-inputs")]
-        return if proposal_step.is_shielding() {
-            Some(orchard::keys::OutgoingViewingKey::from(
+        if proposal_step.is_shielding() {
+            return Some(orchard::keys::OutgoingViewingKey::from(
                 usk.transparent()
                     .to_account_pubkey()
                     .internal_ovk()
                     .as_bytes(),
-            ))
-        } else {
-            Some(orchard_fvk.to_ovk(orchard::keys::Scope::Internal))
-        };
+            ));
+        }
 
-        #[cfg(not(feature = "transparent-inputs"))]
         Some(orchard_fvk.to_ovk(Scope::Internal))
     };
 
@@ -881,18 +878,15 @@ where
 
     let sapling_internal_ovk = || {
         #[cfg(feature = "transparent-inputs")]
-        return if proposal_step.is_shielding() {
-            Some(sapling::keys::OutgoingViewingKey(
+        if proposal_step.is_shielding() {
+            return Some(sapling::keys::OutgoingViewingKey(
                 usk.transparent()
                     .to_account_pubkey()
                     .internal_ovk()
                     .as_bytes(),
-            ))
-        } else {
-            Some(sapling_dfvk.to_ovk(Scope::Internal))
-        };
+            ));
+        }
 
-        #[cfg(not(feature = "transparent-inputs"))]
         Some(sapling_dfvk.to_ovk(Scope::Internal))
     };