diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-02-13 16:45:04 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-02-16 17:13:09 +0000 |
| commit | 89ad162a3ff11629b2fae126a7e12b5d2fd49432 (patch) | |
| tree | 9b8d96faa23171523b8bca7a49ea339132b32329 | |
| parent | wallet2: speed up subaddress generation (by about a third) (diff) | |
| download | monero-89ad162a3ff11629b2fae126a7e12b5d2fd49432.tar.xz | |
wallet2: remove unused m_subaddresses_inv
| -rw-r--r-- | src/wallet/wallet2.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index a17f0ffc6..1ed0d2b57 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -895,7 +895,6 @@ void wallet2::expand_subaddresses(const cryptonote::subaddress_index& index) { const crypto::public_key &D = pkeys[index2.minor]; m_subaddresses[D] = index2; - m_subaddresses_inv[index2] = D; } } m_subaddress_labels.resize(index.major + 1, {"Untitled account"}); @@ -912,7 +911,6 @@ void wallet2::expand_subaddresses(const cryptonote::subaddress_index& index) { const crypto::public_key &D = pkeys[index2.minor - begin]; m_subaddresses[D] = index2; - m_subaddresses_inv[index2] = D; } m_subaddress_labels[index.major].resize(index.minor + 1); } @@ -2342,7 +2340,6 @@ bool wallet2::clear() m_address_book.clear(); m_local_bc_height = 1; m_subaddresses.clear(); - m_subaddresses_inv.clear(); m_subaddress_labels.clear(); return true; } @@ -3184,7 +3181,6 @@ bool wallet2::finalize_multisig(const epee::wipeable_string &password, std::unor } m_subaddresses.clear(); - m_subaddresses_inv.clear(); m_subaddress_labels.clear(); add_subaddress_account(tr("Primary account")); diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index e92abbc69..71302be09 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -780,7 +780,8 @@ namespace tools if (ver < 20) return; a & m_subaddresses; - a & m_subaddresses_inv; + std::unordered_map<cryptonote::subaddress_index, crypto::public_key> dummy_subaddresses_inv; + a & dummy_subaddresses_inv; a & m_subaddress_labels; a & m_additional_tx_keys; if(ver < 21) @@ -1087,7 +1088,6 @@ namespace tools std::unordered_map<crypto::public_key, size_t> m_pub_keys; cryptonote::account_public_address m_account_public_address; std::unordered_map<crypto::public_key, cryptonote::subaddress_index> m_subaddresses; - std::unordered_map<cryptonote::subaddress_index, crypto::public_key> m_subaddresses_inv; std::vector<std::vector<std::string>> m_subaddress_labels; std::unordered_map<crypto::hash, std::string> m_tx_notes; std::unordered_map<std::string, std::string> m_attributes; |