diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-12-26 18:01:24 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-12-26 18:01:24 +0000 |
| commit | b0541a56eb0f3b07eb482726c3d99310e476a9fa (patch) | |
| tree | fffd7a8eb9e7d00b5ef1de860524e2f950f5d4f0 /src | |
| parent | blockchain: Fix height in call to on_blockchain_dec (diff) | |
| download | monero-b0541a56eb0f3b07eb482726c3d99310e476a9fa.tar.xz | |
blockchain: remove obsolete containers
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 6 | ||||
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 2f999b5e3..feb31f2fc 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -499,11 +499,7 @@ bool Blockchain::reset_and_set_genesis_block(const block& b) { LOG_PRINT_L3("Blockchain::" << __func__); CRITICAL_REGION_LOCAL(m_blockchain_lock); - m_transactions.clear(); - m_blocks.clear(); - m_blocks_index.clear(); m_alternative_chains.clear(); - m_outputs.clear(); m_db->reset(); 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, // 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); } diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 2f9287e81..bc167f489 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -195,8 +195,6 @@ namespace cryptonote mutable epee::critical_section m_blockchain_lock; // TODO: add here reader/writer lock // main chain - blocks_container m_blocks; // height -> block_extended_info - blocks_by_id_index m_blocks_index; // crypto::hash -> height transactions_container m_transactions; size_t m_current_block_cumul_sz_limit; @@ -230,7 +228,6 @@ namespace cryptonote // some invalid blocks blocks_ext_by_hash m_invalid_blocks; // crypto::hash -> block_extended_info - outputs_container m_outputs; checkpoints m_checkpoints; |