oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

blockchain: rename get_next_difficulty_for_alternative_chain

Browse source 
- Change get_next_difficulty_for_alternative_chain to
get_difficulty_for_alternative_chain to match
get_difficulty_for_next_block. This was an annoying function to find
because of the irregular naming scheme was different from the canonical
difficulty function.
This commit is contained in:
Doyle 2020-09-02 15:24:05 +10:00 committed by Jason Rhinelander
parent d0b743d667
commit 832127215c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cryptonote_core/blockchain.cpp
View file

@ -1191,7 +1191,7 @@ bool Blockchain::switch_to_alternative_blockchain(const std::list<block_extended
//------------------------------------------------------------------
// This function calculates the difficulty target for the block being added to
// an alternate chain.
difficulty_type Blockchain::get_next_difficulty_for_alternative_chain(const std::list<block_extended_info>& alt_chain, uint64_t alt_block_height) const
difficulty_type Blockchain::get_difficulty_for_alternative_chain(const std::list<block_extended_info>& alt_chain, uint64_t alt_block_height) const
{
if (m_fixed_difficulty)
{
@ -1584,7 +1584,7 @@ bool Blockchain::create_block_template_internal(block& b, const crypto::hash *fr
bei.bl = b;
bei.height = alt_chain.size() ? prev_data.height + 1 : m_db->get_block_height(*from_block) + 1;
diffic = get_next_difficulty_for_alternative_chain(alt_chain, bei.height);
diffic = get_difficulty_for_alternative_chain(alt_chain, bei.height);
}
else
{
@ -1910,7 +1910,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
// NOTE: Check proof of work
difficulty_type const current_diff = get_next_difficulty_for_alternative_chain(alt_chain, blk_height);
difficulty_type const current_diff = get_difficulty_for_alternative_chain(alt_chain, blk_height);
block_pow_verified const blk_pow = verify_block_pow(b, current_diff, chain_height, true /*alt_block*/);
if (!blk_pow.valid)
{

2
src/cryptonote_core/blockchain.h
View file

@ -1344,7 +1344,7 @@ namespace cryptonote
*
* @return the difficulty requirement
*/
difficulty_type get_next_difficulty_for_alternative_chain(const std::list<block_extended_info>& alt_chain, uint64_t height) const;
difficulty_type get_difficulty_for_alternative_chain(const std::list<block_extended_info>& alt_chain, uint64_t height) const;
/**
* @brief sanity checks a miner transaction before validating an entire block