fix tests bug added in #6110

- e.g., fixes gen_block_big_major_version test, error: generation failed: what=events not set, cannot compute valid RandomX PoW
- ask for events only if difficulty > 1 (when it really matters)
- throwing an exception changed to logging, so it is easy to spot a problem if tests start to fail.
This commit is contained in:
Dusan Klinec 2020-01-19 17:15:20 +01:00
parent 51873fec04
commit 6f330865e5
No known key found for this signature in database
GPG Key ID: 6337E118CCBCE103

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){