From 430cbffd25e487e9f83e89b2612a2c71297d0acb Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 19 Jun 2025 17:40:47 +0200 Subject: [PATCH] wallet rpc: WALLET_RPC_ERROR_CODE_GENERIC_ERROR (-9) added --- src/wallet/wallet_rpc_server.cpp | 10 +++++----- src/wallet/wallet_rpc_server_error_codes.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index f49a5d3d..26d9a81a 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -38,25 +38,25 @@ POP_VS_WARNINGS catch (const tools::error::daemon_busy& e) \ { \ er.code = WALLET_RPC_ERROR_CODE_DAEMON_IS_BUSY; \ - er.message = std::string("WALLET_RPC_ERROR_CODE_DAEMON_IS_BUSY") + e.what(); \ + er.message = std::string("WALLET_RPC_ERROR_CODE_DAEMON_IS_BUSY: ") + e.what(); \ return false; \ } \ catch (const tools::error::not_enough_money& e) \ { \ er.code = WALLET_RPC_ERROR_CODE_NOT_ENOUGH_MONEY; \ - er.message = std::string("WALLET_RPC_ERROR_CODE_NOT_ENOUGH_MONEY") + e.error_code(); \ + er.message = std::string("WALLET_RPC_ERROR_CODE_NOT_ENOUGH_MONEY: ") + e.what(); \ return false; \ } \ catch (const tools::error::wallet_error& e) \ { \ er.code = WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR; \ - er.message = e.error_code(); \ + er.message = std::string("WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR: ") + e.what(); \ return false; \ } \ catch (const std::exception& e) \ { \ - er.code = WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR; \ - er.message = std::string("WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR: ") + e.what(); \ + er.code = WALLET_RPC_ERROR_CODE_GENERIC_ERROR; \ + er.message = std::string("WALLET_RPC_ERROR_CODE_GENERIC_ERROR: ") + e.what(); \ return false; \ } \ catch (...) \ diff --git a/src/wallet/wallet_rpc_server_error_codes.h b/src/wallet/wallet_rpc_server_error_codes.h index 676b64ea..8ef2af3f 100644 --- a/src/wallet/wallet_rpc_server_error_codes.h +++ b/src/wallet/wallet_rpc_server_error_codes.h @@ -15,3 +15,4 @@ #define WALLET_RPC_ERROR_CODE_WRONG_ARGUMENT -6 #define WALLET_RPC_ERROR_CODE_NOT_ENOUGH_MONEY -7 #define WALLET_RPC_ERROR_CODE_WRONG_MIXINS_FOR_AUDITABLE_WALLET -8 +#define WALLET_RPC_ERROR_CODE_GENERIC_ERROR -9