aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-03-04 12:07:40 +0200
committerRiccardo Spagni <ric@spagni.net>2019-03-04 12:07:40 +0200
commit4f06639d63da0e6ae3da3f6b086ca2a722566d6f (patch)
tree212ed25acb25fed65e3b48697a5934ee22556bb9
parentMerge pull request #5118 (diff)
parentwallet_rpc_server: remove detached short payment ids support (diff)
downloadmonero-4f06639d63da0e6ae3da3f6b086ca2a722566d6f.tar.xz
Merge pull request #5120
45b7df70 wallet_rpc_server: remove detached short payment ids support (moneromooo-monero)
-rw-r--r--src/wallet/wallet_rpc_server.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index c87c2fca6..4417c11b3 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -691,13 +691,9 @@ namespace tools
if (wallet2::parse_long_payment_id(payment_id_str, long_payment_id)) {
cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, long_payment_id);
}
- /* or short payment ID */
- else if (wallet2::parse_short_payment_id(payment_id_str, short_payment_id)) {
- cryptonote::set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, short_payment_id);
- }
else {
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
- er.message = "Payment id has invalid format: \"" + payment_id_str + "\", expected 16 or 64 character string";
+ er.message = "Payment id has invalid format: \"" + payment_id_str + "\", expected 64 character string";
return false;
}