diff options
| author | practicalswift <[email protected]> | 2018-07-27 08:22:42 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2018-07-27 13:19:03 +0200 |
| commit | d78a8dc3e82564ca8e56b81f9f21af9295b013dd (patch) | |
| tree | 9092fdf9c11cc633313b6c33e0882d361dab7f5c /src/wallet/walletdb.cpp | |
| parent | Merge #13423: [net] Thread safety annotations in net_processing (diff) | |
| download | discoin-d78a8dc3e82564ca8e56b81f9f21af9295b013dd.tar.xz discoin-d78a8dc3e82564ca8e56b81f9f21af9295b013dd.zip | |
Return void instead of bool for functions that cannot fail
* CBlockTreeDB::ReadReindexing(...)
* CChainState::ResetBlockFailureFlags(...)
* CTxMemPool::addUnchecked(...)
* CWallet::LoadDestData(...)
* CWallet::LoadKeyMetadata(...)
* CWallet::LoadScriptMetadata(...)
* CWallet::LoadToWallet(...)
* CWallet::SetHDChain(...)
* CWallet::SetHDSeed(...)
* RemoveLocal(...)
* SetMinVersion(...)
* StartHTTPServer(...)
* StartRPC(...)
* TorControlConnection::Disconnect(...)
Diffstat (limited to 'src/wallet/walletdb.cpp')
| -rw-r--r-- | src/wallet/walletdb.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 67fcaa725..43e474731 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -495,21 +495,13 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, ssKey >> strAddress; ssKey >> strKey; ssValue >> strValue; - if (!pwallet->LoadDestData(DecodeDestination(strAddress), strKey, strValue)) - { - strErr = "Error reading wallet database: LoadDestData failed"; - return false; - } + pwallet->LoadDestData(DecodeDestination(strAddress), strKey, strValue); } else if (strType == "hdchain") { CHDChain chain; ssValue >> chain; - if (!pwallet->SetHDChain(chain, true)) - { - strErr = "Error reading wallet database: SetHDChain failed"; - return false; - } + pwallet->SetHDChain(chain, true); } else if (strType == "flags") { uint64_t flags; ssValue >> flags; |