Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blockchain: remove obsolete containers

This commit is contained in:
moneromooo-monero 2015-12-26 18:01:24 +00:00
parent 18a5211173
commit b0541a56eb
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_core/blockchain.cpp
View File

@ -499,11 +499,7 @@ bool Blockchain::reset_and_set_genesis_block(const block& b)
{ {
LOG_PRINT_L3("Blockchain::" << __func__); LOG_PRINT_L3("Blockchain::" << __func__);
CRITICAL_REGION_LOCAL(m_blockchain_lock); CRITICAL_REGION_LOCAL(m_blockchain_lock);
m_transactions.clear();
m_blocks.clear();
m_blocks_index.clear();
m_alternative_chains.clear(); m_alternative_chains.clear();
m_outputs.clear();
m_db->reset(); m_db->reset();
block_verification_context bvc = boost::value_initialized<block_verification_context>(); block_verification_context bvc = boost::value_initialized<block_verification_context>();
@ -1251,7 +1247,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
{ {
// if block parent is not part of main chain or an alternate chain, // if block parent is not part of main chain or an alternate chain,
// we ignore it // we ignore it
CHECK_AND_ASSERT_MES(parent_in_main, false, "internal error: broken imperative condition it_main_prev != m_blocks_index.end()"); CHECK_AND_ASSERT_MES(parent_in_main, false, "internal error: broken imperative condition: parent_in_main");
complete_timestamps_vector(m_db->get_block_height(b.prev_id), timestamps); complete_timestamps_vector(m_db->get_block_height(b.prev_id), timestamps);
} }

3
src/cryptonote_core/blockchain.h
View File

@ -195,8 +195,6 @@ namespace cryptonote
mutable epee::critical_section m_blockchain_lock; // TODO: add here reader/writer lock mutable epee::critical_section m_blockchain_lock; // TODO: add here reader/writer lock
// main chain // main chain
blocks_container m_blocks; // height -> block_extended_info
blocks_by_id_index m_blocks_index; // crypto::hash -> height
transactions_container m_transactions; transactions_container m_transactions;
size_t m_current_block_cumul_sz_limit; size_t m_current_block_cumul_sz_limit;
@ -230,7 +228,6 @@ namespace cryptonote
// some invalid blocks // some invalid blocks
blocks_ext_by_hash m_invalid_blocks; // crypto::hash -> block_extended_info blocks_ext_by_hash m_invalid_blocks; // crypto::hash -> block_extended_info
outputs_container m_outputs;
checkpoints m_checkpoints; checkpoints m_checkpoints;