From e9fb44ed3ceebb21931974b7d1ab3388124740c6 Mon Sep 17 00:00:00 2001 From: kenshi84 Date: Wed, 12 Apr 2017 21:33:19 +0900 Subject: [PATCH] wallet cli: removed some inappropriate return-false --- src/simplewallet/simplewallet.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index e925e81b5..d91f77614 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -378,7 +378,7 @@ bool simple_wallet::change_password(const std::vector &args) if(orig_pwd_container == boost::none) { fail_msg_writer() << tr("Your original password was incorrect."); - return false; + return true; } // prompts for a new password, pass true to verify the password @@ -392,7 +392,7 @@ bool simple_wallet::change_password(const std::vector &args) catch (const tools::error::wallet_logic_error& e) { fail_msg_writer() << tr("Error with wallet rewrite: ") << e.what(); - return false; + return true; } return true; @@ -2199,8 +2199,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector &args_) { fail_msg_writer() << tr("transaction cancelled."); - // would like to return false, because no tx made, but everything else returns true - // and I don't know what returning false might adversely affect. *sigh* return true; } @@ -2692,8 +2686,6 @@ bool simple_wallet::sweep_all(const std::vector &args_) { fail_msg_writer() << tr("transaction cancelled."); - // would like to return false, because no tx made, but everything else returns true - // and I don't know what returning false might adversely affect. *sigh* return true; } } @@ -2739,8 +2731,6 @@ bool simple_wallet::sweep_all(const std::vector &args_) { fail_msg_writer() << tr("transaction cancelled."); - // would like to return false, because no tx made, but everything else returns true - // and I don't know what returning false might adversely affect. *sigh* return true; } @@ -3159,7 +3149,7 @@ bool simple_wallet::get_tx_key(const std::vector &args_) if(!epee::string_tools::parse_hexstr_to_binbuff(local_args.front(), txid_data) || txid_data.size() != sizeof(crypto::hash)) { fail_msg_writer() << tr("failed to parse txid"); - return false; + return true; } crypto::hash txid = *reinterpret_cast(txid_data.data()); @@ -3844,7 +3834,7 @@ bool simple_wallet::set_tx_note(const std::vector &args) if(!epee::string_tools::parse_hexstr_to_binbuff(args.front(), txid_data) || txid_data.size() != sizeof(crypto::hash)) { fail_msg_writer() << tr("failed to parse txid"); - return false; + return true; } crypto::hash txid = *reinterpret_cast(txid_data.data()); @@ -3872,7 +3862,7 @@ bool simple_wallet::get_tx_note(const std::vector &args) if(!epee::string_tools::parse_hexstr_to_binbuff(args.front(), txid_data) || txid_data.size() != sizeof(crypto::hash)) { fail_msg_writer() << tr("failed to parse txid"); - return false; + return true; } crypto::hash txid = *reinterpret_cast(txid_data.data()); @@ -4172,7 +4162,7 @@ bool simple_wallet::show_transfer(const std::vector &args) if(!epee::string_tools::parse_hexstr_to_binbuff(args.front(), txid_data) || txid_data.size() != sizeof(crypto::hash)) { fail_msg_writer() << tr("failed to parse txid"); - return false; + return true; } crypto::hash txid = *reinterpret_cast(txid_data.data());