Cypher_Stack/wownero
2
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-12-23 06:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7684

Browse Source 
ed6f053 blockchain: speed up repeated pops (mostly in tests) (moneromooo-monero)
This commit is contained in:
luigi1111 2021-06-10 11:46:27 -05:00
commit 667d3dd4c2
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cryptonote_core/blockchain.cpp
View File

@ -566,6 +566,8 @@ void Blockchain::pop_blocks(uint64_t nblocks)
return; return;
} }
CHECK_AND_ASSERT_THROW_MES(update_next_cumulative_weight_limit(), "Error updating next cumulative weight limit");
if (stop_batch) if (stop_batch)
m_db->batch_stop(); m_db->batch_stop();
} }
@ -643,7 +645,6 @@ block Blockchain::pop_block_from_blockchain()
m_scan_table.clear(); m_scan_table.clear();
m_blocks_txs_check.clear(); m_blocks_txs_check.clear();
CHECK_AND_ASSERT_THROW_MES(update_next_cumulative_weight_limit(), "Error updating next cumulative weight limit");
uint64_t top_block_height; uint64_t top_block_height;
crypto::hash top_block_hash = get_tail_id(top_block_height); crypto::hash top_block_hash = get_tail_id(top_block_height);
m_tx_pool.on_blockchain_dec(top_block_height, top_block_hash); m_tx_pool.on_blockchain_dec(top_block_height, top_block_hash);
@ -1110,6 +1111,7 @@ bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain,
{ {
pop_block_from_blockchain(); pop_block_from_blockchain();
} }
CHECK_AND_ASSERT_THROW_MES(update_next_cumulative_weight_limit(), "Error updating next cumulative weight limit");
// make sure the hard fork object updates its current version // make sure the hard fork object updates its current version
m_hardfork->reorganize_from_chain_height(rollback_height); m_hardfork->reorganize_from_chain_height(rollback_height);
@ -1160,6 +1162,7 @@ bool Blockchain::switch_to_alternative_blockchain(std::list<block_extended_info>
block b = pop_block_from_blockchain(); block b = pop_block_from_blockchain();
disconnected_chain.push_front(b); disconnected_chain.push_front(b);
} }
CHECK_AND_ASSERT_THROW_MES(update_next_cumulative_weight_limit(), "Error updating next cumulative weight limit");
auto split_height = m_db->height(); auto split_height = m_db->height();