aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaybee <dev@payb.ee>2014-06-02 22:36:35 +0200
committerpaybee <dev@payb.ee>2014-06-02 22:36:35 +0200
commit295c284c3e4ea6a7ec36353b9b23bb6f5db497f8 (patch)
tree475b2cf27e56c0327f6709b1ce9e158fe819c6fa
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadmonero-295c284c3e4ea6a7ec36353b9b23bb6f5db497f8.tar.xz
Added incoming_transfers RPC API method
Diffstat (limited to '')
-rw-r--r--src/wallet/wallet_rpc_server.cpp15
-rw-r--r--src/wallet/wallet_rpc_server_error_codes.h1
2 files changed, 1 insertions, 15 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 7dc73d8bf..b721a27ab 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -171,7 +171,7 @@ namespace tools
if(req.transfer_type.compare("all") != 0 && req.transfer_type.compare("available") != 0 && req.transfer_type.compare("unavailable") != 0)
{
er.code = WALLET_RPC_ERROR_CODE_TRANSFER_TYPE;
- er.message = "Transfer type must be one of: all, available, or unavailable; provided: "
+ er.message = "Transfer type must be one of: all, available, or unavailable";
return false;
}
@@ -211,19 +211,6 @@ namespace tools
if (!transfers_found)
{
- er.code = WALLET_RPC_ERROR_CODE_NO_TRANSFERS;
- if (!filter)
- {
- er.message = "No incoming transfers";
- }
- else if (available)
- {
- er.message = "No incoming available transfers";
- }
- else
- {
- er.message = "No incoming unavailable transfers";
- }
return false;
}
diff --git a/src/wallet/wallet_rpc_server_error_codes.h b/src/wallet/wallet_rpc_server_error_codes.h
index fb3c1c1a9..a37bde795 100644
--- a/src/wallet/wallet_rpc_server_error_codes.h
+++ b/src/wallet/wallet_rpc_server_error_codes.h
@@ -11,4 +11,3 @@
#define WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR -4
#define WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID -5
#define WALLET_RPC_ERROR_CODE_TRANSFER_TYPE -6
-#define WALLET_RPC_ERROR_CODE_NO_TRANSFERS -7