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

checkpoints: add consts where appropriate

This commit is contained in:
moneromooo-monero 2014-12-06 22:46:51 +00:00 committed by warptangent
parent b7270ab60e
commit 256162fcd5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryptonote_core/checkpoints.cpp
View File

@ -99,7 +99,7 @@ namespace cryptonote
return checkpoint_height < block_height; return checkpoint_height < block_height;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
uint64_t checkpoints::get_max_height() uint64_t checkpoints::get_max_height() const
{ {
std::map< uint64_t, crypto::hash >::const_iterator highest = std::map< uint64_t, crypto::hash >::const_iterator highest =
std::max_element( m_points.begin(), m_points.end(), std::max_element( m_points.begin(), m_points.end(),
@ -108,18 +108,18 @@ namespace cryptonote
return highest->first; return highest->first;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const std::map<uint64_t, crypto::hash>& checkpoints::get_points() const std::map<uint64_t, crypto::hash>& checkpoints::get_points() const
{ {
return m_points; return m_points;
} }
bool checkpoints::check_for_conflicts(checkpoints& other) bool checkpoints::check_for_conflicts(const checkpoints& other) const
{ {
for (auto& pt : other.get_points()) for (auto& pt : other.get_points())
{ {
if (m_points.count(pt.first)) if (m_points.count(pt.first))
{ {
CHECK_AND_ASSERT_MES(pt.second == m_points[pt.first], false, "Checkpoint at given height already exists, and hash for new checkpoint was different!"); CHECK_AND_ASSERT_MES(pt.second == m_points.at(pt.first), false, "Checkpoint at given height already exists, and hash for new checkpoint was different!");
} }
} }
return true; return true;

6
src/cryptonote_core/checkpoints.h
View File

@ -45,9 +45,9 @@ namespace cryptonote
bool check_block(uint64_t height, const crypto::hash& h) const; bool check_block(uint64_t height, const crypto::hash& h) const;
bool check_block(uint64_t height, const crypto::hash& h, bool& is_a_checkpoint) const; bool check_block(uint64_t height, const crypto::hash& h, bool& is_a_checkpoint) const;
bool is_alternative_block_allowed(uint64_t blockchain_height, uint64_t block_height) const; bool is_alternative_block_allowed(uint64_t blockchain_height, uint64_t block_height) const;
uint64_t get_max_height(); uint64_t get_max_height() const;
const std::map<uint64_t, crypto::hash>& get_points(); const std::map<uint64_t, crypto::hash>& get_points() const;
bool check_for_conflicts(checkpoints& other); bool check_for_conflicts(const checkpoints& other) const;
private: private:
std::map<uint64_t, crypto::hash> m_points; std::map<uint64_t, crypto::hash> m_points;
}; };