Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix invalid assertion about fork database results

Browse source
This commit is contained in:
Eric Frias 2015-09-14 15:24:06 -04:00
parent 93c72b0595
commit dd7d57c5ac
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/chain/db_block.cpp
View file

@ -79,10 +79,11 @@ const signed_transaction& database::get_recent_transaction(const transaction_id_
std::vector<block_id_type> database::get_block_ids_on_fork(block_id_type head_of_fork) const std::vector<block_id_type> database::get_block_ids_on_fork(block_id_type head_of_fork) const
{ {
pair<fork_database::branch_type, fork_database::branch_type> branches = _fork_db.fetch_branch_from(head_block_id(), head_of_fork); pair<fork_database::branch_type, fork_database::branch_type> branches = _fork_db.fetch_branch_from(head_block_id(), head_of_fork);
assert(branches.first.back()->id == branches.second.back()->id); assert(branches.first.back()->previous_id() == branches.second.back()->previous_id());
std::vector<block_id_type> result; std::vector<block_id_type> result;
for (const item_ptr& fork_block : branches.second) for (const item_ptr& fork_block : branches.second)
result.emplace_back(fork_block->id); result.emplace_back(fork_block->id);
result.emplace_back(branches.first.back()->previous_id());
return result; return result;
} }