diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-14 22:40:04 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-14 22:40:04 +0200 |
| commit | e35162b36690b4f73d65a07cacd9f2ef4a5d3f61 (patch) | |
| tree | a2c076b13eb186716ca86737d85ba8969940a023 | |
| parent | Merge pull request #2789 (diff) | |
| parent | Fix 383ff4f68943c5d998fba8caa20aee481583f214 (diff) | |
| download | monero-e35162b36690b4f73d65a07cacd9f2ef4a5d3f61.tar.xz | |
Merge pull request #2813
29cee4ec Fix 383ff4f68943c5d998fba8caa20aee481583f214 (Howard Chu)
b85e82bf Fix e89994e98f85be95d68c7bf471fcadf9aabbc93a (Howard Chu)
95e784ad Fix 437421ce42f1deaa7ec3f28c0c17aff519f1230d (Howard Chu)
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 19a0614ec..abf2f2aef 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1270,7 +1270,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) { m_wallet_file = m_generate_from_spend_key; // parse spend secret key - std::string spendkey_string = command_line::input_line("Secret spend key: "); + std::string spendkey_string = input_line("Secret spend key: "); if (std::cin.eof()) return false; if (spendkey_string.empty()) { @@ -3752,7 +3752,7 @@ bool simple_wallet::get_tx_proof(const std::vector<std::string> &args) // fetch tx pubkey crypto::public_key tx_pub_key = get_tx_pub_key_from_extra(tx); - if (tx_pub_key == null_pkey) + if (tx_pub_key == crypto::null_pkey) { fail_msg_writer() << tr("Tx pubkey was not found"); return true; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f6361ee37..c6db45dc9 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -296,7 +296,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file, // compatibility checks if (!field_seed_found && !field_viewkey_found && !field_spendkey_found) { - THROW_WALLET_EXCEPTION(tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified")); + THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified")); } if (field_seed_found && (field_viewkey_found || field_spendkey_found)) { |