From bec223514819c931f2d6a8abe87611567846d141 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Wed, 20 Dec 2017 11:18:59 +0000
Subject: [PATCH] Cleanup: Add braces for clarity

---
 src/wallet/rpcdump.cpp |  9 ++++++---
 src/wallet/wallet.cpp  | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 76a20d66b..52169fe67 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -694,8 +694,9 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
 
     // Height to rescan from
     int nRescanHeight = 0;
-    if (params.size() > 2)
+    if (params.size() > 2) {
         nRescanHeight = params[2].get_int();
+    }
     if (nRescanHeight < 0 || nRescanHeight > chainActive.Height()) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
     }
@@ -706,8 +707,9 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
     auto addr = vkey.address();
 
     {
-        if (pwalletMain->HaveSpendingKey(addr))
+        if (pwalletMain->HaveSpendingKey(addr)) {
             throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this viewing key");
+        }
 
         // Don't throw error in case a viewing key is already there
         if (pwalletMain->HaveViewingKey(addr)) {
@@ -717,8 +719,9 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
         } else {
             pwalletMain->MarkDirty();
 
-            if (!pwalletMain->AddViewingKey(vkey))
+            if (!pwalletMain->AddViewingKey(vkey)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding viewing key to wallet");
+            }
         }
 
         // We want to scan for transactions and notes
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index b2300c2b4..06dae5e83 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -252,22 +252,27 @@ bool CWallet::LoadZKey(const libzcash::SpendingKey &key)
 
 bool CWallet::AddViewingKey(const libzcash::ViewingKey &vk)
 {
-    if (!CCryptoKeyStore::AddViewingKey(vk))
+    if (!CCryptoKeyStore::AddViewingKey(vk)) {
         return false;
+    }
     nTimeFirstKey = 1; // No birthday information for viewing keys.
-    if (!fFileBacked)
+    if (!fFileBacked) {
         return true;
+    }
     return CWalletDB(strWalletFile).WriteViewingKey(vk);
 }
 
 bool CWallet::RemoveViewingKey(const libzcash::ViewingKey &vk)
 {
     AssertLockHeld(cs_wallet);
-    if (!CCryptoKeyStore::RemoveViewingKey(vk))
+    if (!CCryptoKeyStore::RemoveViewingKey(vk)) {
         return false;
-    if (fFileBacked)
-        if (!CWalletDB(strWalletFile).EraseViewingKey(vk))
+    }
+    if (fFileBacked) {
+        if (!CWalletDB(strWalletFile).EraseViewingKey(vk)) {
             return false;
+        }
+    }
 
     return true;
 }