rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 21:03:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6300

Browse Source 
6f330865 fix tests bug added in #6110 (Dusan Klinec)
This commit is contained in:
Alexander Blair 2020-01-24 20:23:24 -08:00
commit 066c327f73
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/core_tests/chaingen.cpp
View File

@ -393,12 +393,18 @@ void test_generator::fill_nonce(cryptonote::block& blk, const difficulty_type& d
const cryptonote::Blockchain *blockchain = nullptr; const cryptonote::Blockchain *blockchain = nullptr;
std::unique_ptr<cryptonote::Blockchain> bc; std::unique_ptr<cryptonote::Blockchain> bc;
if (blk.major_version >= RX_BLOCK_VERSION) if (blk.major_version >= RX_BLOCK_VERSION && diffic > 1)
{
if (m_events == nullptr)
{
MDEBUG("events not set, RandomX PoW can fail due to zero seed hash");
}
else
{ {
CHECK_AND_ASSERT_THROW_MES(m_events != nullptr, "events not set, cannot compute valid RandomX PoW");
bc = init_blockchain(*m_events, m_nettype); bc = init_blockchain(*m_events, m_nettype);
blockchain = bc.get(); blockchain = bc.get();
} }
}
blk.nonce = 0; blk.nonce = 0;
while (!miner::find_nonce_for_given_block([blockchain](const cryptonote::block &b, uint64_t height, unsigned int threads, crypto::hash &hash){ while (!miner::find_nonce_for_given_block([blockchain](const cryptonote::block &b, uint64_t height, unsigned int threads, crypto::hash &hash){