diff options
| author | stoffu <stoffu@protonmail.ch> | 2017-11-15 20:37:18 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2017-11-15 20:45:58 +0900 |
| commit | c4587e83f84fa0ecfcfa5c4538697ae96162afe2 (patch) | |
| tree | 47fb912cb15dcb2828c693188254c6571bbf6e80 | |
| parent | Merge pull request #2778 (diff) | |
| download | monero-c4587e83f84fa0ecfcfa5c4538697ae96162afe2.tar.xz | |
simplewallet: wrong ns for input_line in sweep_single (fix #2634)
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 9b5752b19..37db00bc1 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3466,7 +3466,7 @@ bool simple_wallet::sweep_single(const std::vector<std::string> &args_) // prompt if there is no payment id and confirmation is required if (!payment_id_seen && m_wallet->confirm_missing_payment_id()) { - std::string accepted = command_line::input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); + std::string accepted = input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); if (std::cin.eof()) return true; if (!command_line::is_yes(accepted)) @@ -3509,7 +3509,7 @@ bool simple_wallet::sweep_single(const std::vector<std::string> &args_) prompt << boost::format(tr("Sweeping %s for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % print_money(total_sent) % print_money(total_fee); - std::string accepted = command_line::input_line(prompt.str()); + std::string accepted = input_line(prompt.str()); if (std::cin.eof()) return true; if (!command_line::is_yes(accepted)) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 09ed205c6..f5838d013 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -846,7 +846,7 @@ namespace tools try { - uint64_t mixin = adjust_mixin(req.mixin); + uint64_t mixin = m_wallet->adjust_mixin(req.mixin); std::vector<wallet2::pending_tx> ptx_vector = m_wallet->create_transactions_single(ki, dsts[0].addr, dsts[0].is_subaddress, mixin, req.unlock_time, req.priority, extra, m_trusted_daemon); if (ptx_vector.empty()) diff --git a/src/wallet/wallet_rpc_server.h b/src/wallet/wallet_rpc_server.h index 2a51ddf46..36a853a1a 100644 --- a/src/wallet/wallet_rpc_server.h +++ b/src/wallet/wallet_rpc_server.h @@ -167,7 +167,6 @@ namespace tools void fill_transfer_entry(tools::wallet_rpc::transfer_entry &entry, const crypto::hash &txid, const tools::wallet2::unconfirmed_transfer_details &pd); void fill_transfer_entry(tools::wallet_rpc::transfer_entry &entry, const crypto::hash &payment_id, const tools::wallet2::pool_payment_details &pd); bool not_open(epee::json_rpc::error& er); - uint64_t adjust_mixin(uint64_t mixin); void handle_rpc_exception(const std::exception_ptr& e, epee::json_rpc::error& er, int default_error_code); wallet2 *m_wallet; |