Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-11-21 09:40:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2591

Browse source 
93ad1f87 Fix #2559: more flexible print_tx daemon command (binaryFate)
This commit is contained in:
Riccardo Spagni 2017-11-06 01:54:48 +02:00
commit 7452359d8f
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/daemon/command_parser_executor.cpp
View file

@ -187,9 +187,24 @@ bool t_command_parser_executor::print_block(const std::vector<std::string>& args
bool t_command_parser_executor::print_transaction(const std::vector<std::string>& args)
{
bool include_hex = false;
bool include_json = false;
// Assumes that optional flags come after mandatory argument <transaction_hash>
for (unsigned int i = 1; i < args.size(); ++i) {
if (args[i] == "+hex")
include_hex = true;
else if (args[i] == "+json")
include_json = true;
else
{
std::cout << "unexpected argument: " << args[i] << std::endl;
return true;
}
}
if (args.empty())
{
std::cout << "expected: print_tx <transaction hash>" << std::endl;
std::cout << "expected: print_tx <transaction_hash> [+hex] [+json]" << std::endl;
return true;
}
@ -197,7 +212,7 @@ bool t_command_parser_executor::print_transaction(const std::vector<std::string>
crypto::hash tx_hash;
if (parse_hash256(str_hash, tx_hash))
{
m_executor.print_transaction(tx_hash);
m_executor.print_transaction(tx_hash, include_hex, include_json);
}
return true;