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

Reverse direction of fork history used in block syncing

Browse source
This commit is contained in:
Eric Frias 2015-09-15 09:16:36 -04:00
parent f506c2b089
commit 1177cfe0ed
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/app/application.cpp
View file

@ -42,6 +42,7 @@
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <boost/signals2.hpp> #include <boost/signals2.hpp>
#include <boost/range/algorithm/reverse.hpp>
#include <iostream> #include <iostream>
@ -617,18 +618,19 @@ namespace detail {
// block is a block we know about, but it is on a fork // block is a block we know about, but it is on a fork
try try
{ {
std::vector<block_id_type> fork_history = _chain_db->get_block_ids_on_fork(reference_point); fork_history = _chain_db->get_block_ids_on_fork(reference_point);
// returns a vector where the first element is the common ancestor with the preferred chain, // returns a vector where the last element is the common ancestor with the preferred chain,
// and the last element is the reference point you passed in // and the first element is the reference point you passed in
assert(fork_history.size() >= 2); assert(fork_history.size() >= 2);
if( fork_history.back() != reference_point )
if( fork_history.front() != reference_point )
{ {
edump( (fork_history)(reference_point) ); edump( (fork_history)(reference_point) );
assert(fork_history.back() == reference_point); assert(fork_history.front() == reference_point);
} }
block_id_type last_non_fork_block = fork_history.back();
block_id_type last_non_fork_block = fork_history.front(); fork_history.pop_back(); // remove the common ancestor
fork_history.erase(fork_history.begin()); // remove the common ancestor boost::reverse(fork_history);
if (last_non_fork_block == block_id_type()) // if the fork goes all the way back to genesis (does graphene's fork db allow this?) if (last_non_fork_block == block_id_type()) // if the fork goes all the way back to genesis (does graphene's fork db allow this?)
non_fork_high_block_num = 0; non_fork_high_block_num = 0;