rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-22 19:03:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5045

Browse Source 
050ee521 wallet_api: fix usage of LOG_ERROR (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-07 21:27:33 +02:00
commit 094b0c4d00
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wallet/api/wallet.cpp
View File

@ -1149,7 +1149,7 @@ std::string WalletImpl::getSubaddressLabel(uint32_t accountIndex, uint32_t addre
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {
LOG_ERROR("Error getting subaddress label: ") << e.what(); LOG_ERROR("Error getting subaddress label: " << e.what());
setStatusError(string(tr("Failed to get subaddress label: ")) + e.what()); setStatusError(string(tr("Failed to get subaddress label: ")) + e.what());
return ""; return "";
} }
@ -1162,7 +1162,7 @@ void WalletImpl::setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {
LOG_ERROR("Error setting subaddress label: ") << e.what(); LOG_ERROR("Error setting subaddress label: " << e.what());
setStatusError(string(tr("Failed to set subaddress label: ")) + e.what()); setStatusError(string(tr("Failed to set subaddress label: ")) + e.what());
} }
} }
@ -1179,7 +1179,7 @@ string WalletImpl::getMultisigInfo() const {
clearStatus(); clearStatus();
return m_wallet->get_multisig_info(); return m_wallet->get_multisig_info();
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on generating multisig info: ") << e.what(); LOG_ERROR("Error on generating multisig info: " << e.what());
setStatusError(string(tr("Failed to get multisig info: ")) + e.what()); setStatusError(string(tr("Failed to get multisig info: ")) + e.what());
} }
@ -1196,7 +1196,7 @@ string WalletImpl::makeMultisig(const vector<string>& info, uint32_t threshold)
return m_wallet->make_multisig(epee::wipeable_string(m_password), info, threshold); return m_wallet->make_multisig(epee::wipeable_string(m_password), info, threshold);
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on making multisig wallet: ") << e.what(); LOG_ERROR("Error on making multisig wallet: " << e.what());
setStatusError(string(tr("Failed to make multisig: ")) + e.what()); setStatusError(string(tr("Failed to make multisig: ")) + e.what());
} }
@ -1210,7 +1210,7 @@ std::string WalletImpl::exchangeMultisigKeys(const std::vector<std::string> &inf
return m_wallet->exchange_multisig_keys(epee::wipeable_string(m_password), info); return m_wallet->exchange_multisig_keys(epee::wipeable_string(m_password), info);
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on exchanging multisig keys: ") << e.what(); LOG_ERROR("Error on exchanging multisig keys: " << e.what());
setStatusError(string(tr("Failed to make multisig: ")) + e.what()); setStatusError(string(tr("Failed to make multisig: ")) + e.what());
} }
@ -1228,7 +1228,7 @@ bool WalletImpl::finalizeMultisig(const vector<string>& extraMultisigInfo) {
setStatusError(tr("Failed to finalize multisig wallet creation")); setStatusError(tr("Failed to finalize multisig wallet creation"));
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on finalizing multisig wallet creation: ") << e.what(); LOG_ERROR("Error on finalizing multisig wallet creation: " << e.what());
setStatusError(string(tr("Failed to finalize multisig wallet creation: ")) + e.what()); setStatusError(string(tr("Failed to finalize multisig wallet creation: ")) + e.what());
} }
@ -1244,7 +1244,7 @@ bool WalletImpl::exportMultisigImages(string& images) {
images = epee::string_tools::buff_to_hex_nodelimer(blob); images = epee::string_tools::buff_to_hex_nodelimer(blob);
return true; return true;
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on exporting multisig images: ") << e.what(); LOG_ERROR("Error on exporting multisig images: " << e.what());
setStatusError(string(tr("Failed to export multisig images: ")) + e.what()); setStatusError(string(tr("Failed to export multisig images: ")) + e.what());
} }
@ -1272,7 +1272,7 @@ size_t WalletImpl::importMultisigImages(const vector<string>& images) {
return m_wallet->import_multisig(blobs); return m_wallet->import_multisig(blobs);
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on importing multisig images: ") << e.what(); LOG_ERROR("Error on importing multisig images: " << e.what());
setStatusError(string(tr("Failed to import multisig images: ")) + e.what()); setStatusError(string(tr("Failed to import multisig images: ")) + e.what());
} }
@ -1286,7 +1286,7 @@ bool WalletImpl::hasMultisigPartialKeyImages() const {
return m_wallet->has_multisig_partial_key_images(); return m_wallet->has_multisig_partial_key_images();
} catch (const exception& e) { } catch (const exception& e) {
LOG_ERROR("Error on checking for partial multisig key images: ") << e.what(); LOG_ERROR("Error on checking for partial multisig key images: " << e.what());
setStatusError(string(tr("Failed to check for partial multisig key images: ")) + e.what()); setStatusError(string(tr("Failed to check for partial multisig key images: ")) + e.what());
} }
@ -1314,7 +1314,7 @@ PendingTransaction* WalletImpl::restoreMultisigTransaction(const string& signDat
return ptx; return ptx;
} catch (exception& e) { } catch (exception& e) {
LOG_ERROR("Error on restoring multisig transaction: ") << e.what(); LOG_ERROR("Error on restoring multisig transaction: " << e.what());
setStatusError(string(tr("Failed to restore multisig transaction: ")) + e.what()); setStatusError(string(tr("Failed to restore multisig transaction: ")) + e.what());
} }