Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blockchain: change code to mirror original CN code 

I'm not quite sure the two are equivalent, so use the original
CN expression for safety and verification purposes.
This commit is contained in:
moneromooo-monero 2015-08-24 18:40:19 +01:00
parent 0c8523711b
commit 008a54ddc4
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View File

@ -1195,7 +1195,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
// make sure block connects correctly to the main chain // make sure block connects correctly to the main chain
auto h = m_db->get_block_hash_from_height(alt_chain.front()->second.height - 1); auto h = m_db->get_block_hash_from_height(alt_chain.front()->second.height - 1);
CHECK_AND_ASSERT_MES(h == alt_chain.front()->second.bl.prev_id, false, "alternative chain has wrong connection to main chain"); CHECK_AND_ASSERT_MES(h == alt_chain.front()->second.bl.prev_id, false, "alternative chain has wrong connection to main chain");
complete_timestamps_vector(m_db->get_block_height(alt_chain.front()->second.bl.prev_id), timestamps); complete_timestamps_vector(alt_chain.front()->second.height - 1, timestamps);
} }
// if block not associated with known alternate chain // if block not associated with known alternate chain
else else