Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 02:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

wallet2: remove unused m_subaddresses_inv

Browse Source
This commit is contained in:
moneromooo-monero 2018-02-13 16:45:04 +00:00
parent f2c4c39971
commit 89ad162a3f
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View File

@ -895,7 +895,6 @@ void wallet2::expand_subaddresses(const cryptonote::subaddress_index& index)
{ {
const crypto::public_key &D = pkeys[index2.minor]; const crypto::public_key &D = pkeys[index2.minor];
m_subaddresses[D] = index2; m_subaddresses[D] = index2;
m_subaddresses_inv[index2] = D;
} }
} }
m_subaddress_labels.resize(index.major + 1, {"Untitled account"}); 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]; const crypto::public_key &D = pkeys[index2.minor - begin];
m_subaddresses[D] = index2; m_subaddresses[D] = index2;
m_subaddresses_inv[index2] = D;
} }
m_subaddress_labels[index.major].resize(index.minor + 1); m_subaddress_labels[index.major].resize(index.minor + 1);
} }
@ -2342,7 +2340,6 @@ bool wallet2::clear()
m_address_book.clear(); m_address_book.clear();
m_local_bc_height = 1; m_local_bc_height = 1;
m_subaddresses.clear(); m_subaddresses.clear();
m_subaddresses_inv.clear();
m_subaddress_labels.clear(); m_subaddress_labels.clear();
return true; return true;
} }
@ -3184,7 +3181,6 @@ bool wallet2::finalize_multisig(const epee::wipeable_string &password, std::unor
} }
m_subaddresses.clear(); m_subaddresses.clear();
m_subaddresses_inv.clear();
m_subaddress_labels.clear(); m_subaddress_labels.clear();
add_subaddress_account(tr("Primary account")); add_subaddress_account(tr("Primary account"));

4
src/wallet/wallet2.h
View File

@ -780,7 +780,8 @@ namespace tools
if (ver < 20) if (ver < 20)
return; return;
a & m_subaddresses; 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_subaddress_labels;
a & m_additional_tx_keys; a & m_additional_tx_keys;
if(ver < 21) if(ver < 21)
@ -1087,7 +1088,6 @@ namespace tools
std::unordered_map<crypto::public_key, size_t> m_pub_keys; std::unordered_map<crypto::public_key, size_t> m_pub_keys;
cryptonote::account_public_address m_account_public_address; cryptonote::account_public_address m_account_public_address;
std::unordered_map<crypto::public_key, cryptonote::subaddress_index> m_subaddresses; 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::vector<std::vector<std::string>> m_subaddress_labels;
std::unordered_map<crypto::hash, std::string> m_tx_notes; std::unordered_map<crypto::hash, std::string> m_tx_notes;
std::unordered_map<std::string, std::string> m_attributes; std::unordered_map<std::string, std::string> m_attributes;