Merge pull request #4427

83debef9 wallet_rpc_server: remove verbose field in incoming_transfers query (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-29 22:12:31 +02:00
commit 52b639bcd0
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 1 additions and 3 deletions

View File

@ -1554,7 +1554,7 @@ namespace tools
rpc_transfers.global_index = td.m_global_output_index; rpc_transfers.global_index = td.m_global_output_index;
rpc_transfers.tx_hash = epee::string_tools::pod_to_hex(td.m_txid); rpc_transfers.tx_hash = epee::string_tools::pod_to_hex(td.m_txid);
rpc_transfers.subaddr_index = {td.m_subaddr_index.major, td.m_subaddr_index.minor}; rpc_transfers.subaddr_index = {td.m_subaddr_index.major, td.m_subaddr_index.minor};
rpc_transfers.key_image = req.verbose && td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : ""; rpc_transfers.key_image = td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : "";
res.transfers.push_back(rpc_transfers); res.transfers.push_back(rpc_transfers);
} }
} }

View File

@ -883,13 +883,11 @@ namespace wallet_rpc
std::string transfer_type; std::string transfer_type;
uint32_t account_index; uint32_t account_index;
std::set<uint32_t> subaddr_indices; std::set<uint32_t> subaddr_indices;
bool verbose;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(transfer_type) KV_SERIALIZE(transfer_type)
KV_SERIALIZE(account_index) KV_SERIALIZE(account_index)
KV_SERIALIZE(subaddr_indices) KV_SERIALIZE(subaddr_indices)
KV_SERIALIZE(verbose)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };