aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-10-04 12:05:11 +0200
committerRiccardo Spagni <ric@spagni.net>2016-10-04 12:05:11 +0200
commit895d20f90197d82a9fe188798b8a6dce731e2e52 (patch)
treed145f440b2bce65692cc86a0123c05d7779c475e
parentMerge pull request #1171 (diff)
parentblockchain: do not reject chain histories matching only genesis (diff)
downloadmonero-895d20f90197d82a9fe188798b8a6dce731e2e52.tar.xz
Merge pull request #1123
0d036be blockchain: do not reject chain histories matching only genesis (moneromooo-monero)
-rw-r--r--src/cryptonote_core/blockchain.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index b9b9e2fb9..74e1419c8 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1830,14 +1830,6 @@ bool Blockchain::find_blockchain_supplement(const std::list<crypto::hash>& qbloc
return false;
}
- // if split_height remains 0, we didn't have any but the genesis block in common
- // which is only fine if the blocks just have the genesis block
- if(split_height == 0 && qblock_ids.size() > 1)
- {
- LOG_ERROR("Ours and foreign blockchain have only genesis block in common... o.O");
- return false;
- }
-
//we start to put block ids INCLUDING last known id, just to make other side be sure
starter_offset = split_height;
return true;