Merge pull request #3896

6b8568e simplewallet.sign_transfer: rename export to export_raw, add help message (stoffu)
This commit is contained in:
luigi1111 2018-06-20 14:13:59 -05:00
commit 034b0c7adb
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -2188,8 +2188,8 @@ simple_wallet::simple_wallet()
tr("Donate <amount> to the development team (donate.getmonero.org).")); tr("Donate <amount> to the development team (donate.getmonero.org)."));
m_cmd_binder.set_handler("sign_transfer", m_cmd_binder.set_handler("sign_transfer",
boost::bind(&simple_wallet::sign_transfer, this, _1), boost::bind(&simple_wallet::sign_transfer, this, _1),
tr("sign_transfer [export]"), tr("sign_transfer [export_raw]"),
tr("Sign a transaction from a file.")); tr("Sign a transaction from a file. If the parameter \"export_raw\" is specified, transaction raw hex data suitable for the daemon RPC /sendrawtransaction is exported."));
m_cmd_binder.set_handler("submit_transfer", m_cmd_binder.set_handler("submit_transfer",
boost::bind(&simple_wallet::submit_transfer, this, _1), boost::bind(&simple_wallet::submit_transfer, this, _1),
tr("Submit a signed transaction from a file.")); tr("Submit a signed transaction from a file."));
@ -5593,9 +5593,9 @@ bool simple_wallet::sign_transfer(const std::vector<std::string> &args_)
fail_msg_writer() << tr("This is a watch only wallet"); fail_msg_writer() << tr("This is a watch only wallet");
return true; return true;
} }
if (args_.size() > 1 || (args_.size() == 1 && args_[0] != "export")) if (args_.size() > 1 || (args_.size() == 1 && args_[0] != "export_raw"))
{ {
fail_msg_writer() << tr("usage: sign_transfer [export]"); fail_msg_writer() << tr("usage: sign_transfer [export_raw]");
return true; return true;
} }
if (m_wallet->ask_password() && !get_and_verify_password()) { return true; } if (m_wallet->ask_password() && !get_and_verify_password()) { return true; }