Browse Source

Cleanup: Add braces for clarity

pull/4/head
Jack Grigg 7 years ago
parent
commit
bec2235148
No known key found for this signature in database GPG Key ID: 665DBCD284F7DAFF
  1. 9
      src/wallet/rpcdump.cpp
  2. 15
      src/wallet/wallet.cpp

9
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

15
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;
}

Loading…
Cancel
Save