Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5406

Browse Source 
bea1918a blockchain_import: error out if preparing to handle blocks fails (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-16 22:32:27 +02:00
commit 313a56a2da
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/blockchain_utilities/blockchain_import.cpp
View File

@ -194,7 +194,11 @@ int check_flush(cryptonote::core &core, std::vector<block_complete_entry> &block
core.prevalidate_block_hashes(core.get_blockchain_storage().get_db().height(), hashes); core.prevalidate_block_hashes(core.get_blockchain_storage().get_db().height(), hashes);
std::vector<block> pblocks; std::vector<block> pblocks;
core.prepare_handle_incoming_blocks(blocks, pblocks); if (!core.prepare_handle_incoming_blocks(blocks, pblocks))
{
MERROR("Failed to prepare to add blocks");
return 1;
}
if (!pblocks.empty() && pblocks.size() != blocks.size()) if (!pblocks.empty() && pblocks.size() != blocks.size())
{ {
MERROR("Unexpected parsed blocks size"); MERROR("Unexpected parsed blocks size");