monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3197

Browse source 
f90c76be Return appropriate error code when there's no connection to daemon (Michał Sałaban)
3cb65b3f Return appropriate error code when not enough money for tx (Michał Sałaban)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:21:00 +01:00
commit b23578e473
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/wallet_rpc_server.cpp
View file

@ -2397,6 +2397,11 @@ namespace tools
{ {
std::rethrow_exception(e); std::rethrow_exception(e);
} }
catch (const tools::error::no_connection_to_daemon& e)
{
er.code = WALLET_RPC_ERROR_CODE_NO_DAEMON_CONNECTION;
er.message = e.what();
}
catch (const tools::error::daemon_busy& e) catch (const tools::error::daemon_busy& e)
{ {
er.code = WALLET_RPC_ERROR_CODE_DAEMON_IS_BUSY; er.code = WALLET_RPC_ERROR_CODE_DAEMON_IS_BUSY;
@ -2412,6 +2417,11 @@ namespace tools
er.code = WALLET_RPC_ERROR_CODE_NOT_ENOUGH_MONEY; er.code = WALLET_RPC_ERROR_CODE_NOT_ENOUGH_MONEY;
er.message = e.what(); er.message = e.what();
} }
catch (const tools::error::not_enough_unlocked_money& e)
{
er.code = WALLET_RPC_ERROR_CODE_NOT_ENOUGH_UNLOCKED_MONEY;
er.message = e.what();
}
catch (const tools::error::tx_not_possible& e) catch (const tools::error::tx_not_possible& e)
{ {
er.code = WALLET_RPC_ERROR_CODE_TX_NOT_POSSIBLE; er.code = WALLET_RPC_ERROR_CODE_TX_NOT_POSSIBLE;

2
src/wallet/wallet_rpc_server_error_codes.h
View file

@ -67,3 +67,5 @@
#define WALLET_RPC_ERROR_CODE_BAD_MULTISIG_TX_DATA -34 #define WALLET_RPC_ERROR_CODE_BAD_MULTISIG_TX_DATA -34
#define WALLET_RPC_ERROR_CODE_MULTISIG_SIGNATURE -35 #define WALLET_RPC_ERROR_CODE_MULTISIG_SIGNATURE -35
#define WALLET_RPC_ERROR_CODE_MULTISIG_SUBMISSION -36 #define WALLET_RPC_ERROR_CODE_MULTISIG_SUBMISSION -36
#define WALLET_RPC_ERROR_CODE_NOT_ENOUGH_UNLOCKED_MONEY -37
#define WALLET_RPC_ERROR_CODE_NO_DAEMON_CONNECTION -38