From 87462bb4f9bf18dec7840891015885befc02c05d Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 25 Feb 2019 17:31:21 +0300 Subject: [PATCH] wallet2/account: minor const refactoring --- src/currency_core/account.cpp | 2 +- src/currency_core/account.h | 2 +- src/wallet/wallet2.h | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/currency_core/account.cpp b/src/currency_core/account.cpp index ce8b177c..37f5aab9 100644 --- a/src/currency_core/account.cpp +++ b/src/currency_core/account.cpp @@ -116,7 +116,7 @@ namespace currency return true; } //----------------------------------------------------------------- - std::string account_base::get_public_address_str() + std::string account_base::get_public_address_str() const { //TODO: change this code into base 58 return get_account_address_as_str(m_keys.m_account_address); diff --git a/src/currency_core/account.h b/src/currency_core/account.h index 7e259731..656c497c 100644 --- a/src/currency_core/account.h +++ b/src/currency_core/account.h @@ -50,7 +50,7 @@ namespace currency void generate(); const account_keys& get_keys() const; const account_public_address& get_public_address() const { return m_keys.m_account_address; }; - std::string get_public_address_str(); + std::string get_public_address_str() const; std::string get_restore_data() const; std::string get_restore_braindata() const; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 927015a5..9efefcea 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -255,7 +255,8 @@ namespace tools void store(); void store(const std::wstring& path); std::wstring get_wallet_path(){ return m_wallet_file; } - currency::account_base& get_account(){return m_account;} + currency::account_base& get_account() { return m_account; } + const currency::account_base& get_account() const { return m_account; } void get_recent_transfers_history(std::vector& trs, size_t offset, size_t count); uint64_t get_recent_transfers_total_count(); @@ -497,6 +498,8 @@ namespace tools std::vector& prepared_destinations, crypto::hash multisig_id = currency::null_hash); + std::string get_log_prefix() const { return m_log_prefix; } + private: void add_transfers_to_expiration_list(const std::vector& selected_transfers, uint64_t expiration, uint64_t change_amount, const crypto::hash& related_tx_id); void remove_transfer_from_expiration_list(uint64_t transfer_index);