From dd7d57c5ac89d8699f91eb6daee72b0854bfb860 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 14 Sep 2015 15:24:06 -0400 Subject: [PATCH] Fix invalid assertion about fork database results --- libraries/chain/db_block.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 9014300e..518fccd0 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -79,10 +79,11 @@ const signed_transaction& database::get_recent_transaction(const transaction_id_ std::vector database::get_block_ids_on_fork(block_id_type head_of_fork) const { pair 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 result; for (const item_ptr& fork_block : branches.second) result.emplace_back(fork_block->id); + result.emplace_back(branches.first.back()->previous_id()); return result; }