diff options
| author | stoffu <stoffu@protonmail.ch> | 2018-01-17 10:25:24 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2018-01-26 10:59:32 +0900 |
| commit | 3160a93027cf34385f0f2dc7a0ed572b9679d69e (patch) | |
| tree | 15d0e0d615a70daf0d694f6a09dbb62364e0e82f | |
| parent | wallet2: make scan_output const and omit keys arg (diff) | |
| download | monero-3160a93027cf34385f0f2dc7a0ed572b9679d69e.tar.xz | |
wallet2: remove {set|get}_default_decimal_point and use the same funcs under cryptonote:: instead
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 10 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index b6b6da441..5ab01a0b7 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1384,7 +1384,7 @@ bool simple_wallet::set_unit(const std::vector<std::string> &args/* = std::vecto const auto pwd_container = get_and_verify_password(); if (pwd_container) { - m_wallet->set_default_decimal_point(decimal_point); + cryptonote::set_default_decimal_point(decimal_point); m_wallet->rewrite(m_wallet_file, pwd_container->password()); } return true; @@ -1818,7 +1818,7 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args) success_msg_writer() << "priority = " << m_wallet->get_default_priority(); success_msg_writer() << "confirm-missing-payment-id = " << m_wallet->confirm_missing_payment_id(); success_msg_writer() << "ask-password = " << m_wallet->ask_password(); - success_msg_writer() << "unit = " << cryptonote::get_unit(m_wallet->get_default_decimal_point()); + success_msg_writer() << "unit = " << cryptonote::get_unit(cryptonote::get_default_decimal_point()); success_msg_writer() << "min-outputs-count = " << m_wallet->get_min_output_count(); success_msg_writer() << "min-outputs-value = " << cryptonote::print_money(m_wallet->get_min_output_value()); success_msg_writer() << "merge-destinations = " << m_wallet->merge_destinations(); diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index b08a64cb2..65c963f74 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3410,16 +3410,6 @@ bool wallet2::parse_payment_id(const std::string& payment_id_str, crypto::hash& return false; } //---------------------------------------------------------------------------------------------------- -void wallet2::set_default_decimal_point(unsigned int decimal_point) -{ - cryptonote::set_default_decimal_point(decimal_point); -} -//---------------------------------------------------------------------------------------------------- -unsigned int wallet2::get_default_decimal_point() const -{ - return cryptonote::get_default_decimal_point(); -} -//---------------------------------------------------------------------------------------------------- bool wallet2::prepare_file_names(const std::string& file_path) { do_prepare_file_names(file_path, m_keys_file, m_wallet_file); diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index eb63fcadc..7a84a56f9 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -825,8 +825,6 @@ namespace tools void confirm_missing_payment_id(bool always) { m_confirm_missing_payment_id = always; } bool ask_password() const { return m_ask_password; } void ask_password(bool always) { m_ask_password = always; } - void set_default_decimal_point(unsigned int decimal_point); - unsigned int get_default_decimal_point() const; void set_min_output_count(uint32_t count) { m_min_output_count = count; } uint32_t get_min_output_count() const { return m_min_output_count; } void set_min_output_value(uint64_t value) { m_min_output_value = value; } |