From e53fd7a0624ea1a8b2ee10f643ac382c1a8ecf7c Mon Sep 17 00:00:00 2001 From: SChernykh Date: Wed, 1 Mar 2023 09:20:09 +0100 Subject: [PATCH] Tests: fixed block_template test volatility Hashes should stay the same from now on. --- src/block_template.cpp | 4 ++++ tests/CMakeLists.txt | 1 + tests/src/block_template_tests.cpp | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/block_template.cpp b/src/block_template.cpp index ec21e14..708359c 100644 --- a/src/block_template.cpp +++ b/src/block_template.cpp @@ -647,7 +647,11 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, Wallet // Layout: [software id, version, random number, sidechain extra_nonce] uint32_t* sidechain_extra = m_poolBlockTemplate->m_sidechainExtraBuf; sidechain_extra[0] = 0; +#ifdef P2POOL_SIDECHAIN_EXTRA_1 + sidechain_extra[1] = P2POOL_SIDECHAIN_EXTRA_1; +#else sidechain_extra[1] = (P2POOL_VERSION_MAJOR << 16) | P2POOL_VERSION_MINOR; +#endif sidechain_extra[2] = static_cast(m_rng() >> 32); sidechain_extra[3] = 0; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b504198..e9077a4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,6 +17,7 @@ set(LIBS ${LIBS} randomx) add_definitions(-DWITH_RANDOMX) add_definitions(-DP2POOL_UNIT_TESTS) +add_definitions(-DP2POOL_SIDECHAIN_EXTRA_1=1) include(cmake/flags.cmake) diff --git a/tests/src/block_template_tests.cpp b/tests/src/block_template_tests.cpp index 31674de..8f6dac7 100644 --- a/tests/src/block_template_tests.cpp +++ b/tests/src/block_template_tests.cpp @@ -60,7 +60,7 @@ TEST(block_template, update) tpl.update(data, mempool, &wallet); const PoolBlock* b = tpl.pool_block_template(); - ASSERT_EQ(b->m_sidechainId, H("5b6d5ac9e8cc8b973cedbf6114584b79f03f9d7d9d413a8f7e6fc398aac1a26c")); + ASSERT_EQ(b->m_sidechainId, H("0355a4eeb586ab4d30f3ba89f0ebf7ac1c34a55aebf1bee50af04ff893330280")); std::vector blobs; uint64_t height; @@ -79,7 +79,7 @@ TEST(block_template, update) hash blobs_hash; keccak(blobs.data(), static_cast(blobs.size()), blobs_hash.h); - ASSERT_EQ(blobs_hash, H("a500d8d337db35f8c3e8e70dea78122ea3cfb87874245bbc4e5f48892e8d1cb1")); + ASSERT_EQ(blobs_hash, H("70ee1661794c9a55f006432b57b0fc37922e0ccf8f1e4294b43890f8a6f44c62")); // Test 2: mempool with high fee and low fee transactions, it must choose high fee transactions for (uint64_t i = 0; i < 512; ++i) {