From 81cb0fcdccf08afd6f37d21ccfefb31131fd3950 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 25 Dec 2015 22:07:58 +0000 Subject: blockchain: fix bitflipping test with quantized block rewards Block reward may now be less than the full amount allowed. This was breaking the bitflipping test. We now keep track of whether a block which was accepted by the core has a lower than allowed block reward, and allow this in the test. --- tests/core_tests/block_validation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/core_tests/block_validation.cpp') diff --git a/tests/core_tests/block_validation.cpp b/tests/core_tests/block_validation.cpp index 440e46647..e4242f8fe 100644 --- a/tests/core_tests/block_validation.cpp +++ b/tests/core_tests/block_validation.cpp @@ -618,7 +618,8 @@ bool gen_block_invalid_binary_format::check_block_verification_context(const cry } else { - return !bvc.m_added_to_main_chain && (bvc.m_already_exists || bvc.m_marked_as_orphaned || bvc.m_verifivation_failed); + return (!bvc.m_added_to_main_chain && (bvc.m_already_exists || bvc.m_marked_as_orphaned || bvc.m_verifivation_failed)) + || (bvc.m_added_to_main_chain && bvc.m_partial_block_reward); } } -- cgit v1.2.3 From 2358d0d5be34f8dca0c14f94979300ed49e3f29f Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 25 Dec 2015 22:22:12 +0000 Subject: tests: use 255 as a "too high" block version While the original cryptonote accepted only the current major version, we can accept higher ones. --- tests/core_tests/block_validation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/core_tests/block_validation.cpp') diff --git a/tests/core_tests/block_validation.cpp b/tests/core_tests/block_validation.cpp index e4242f8fe..8589f07b8 100644 --- a/tests/core_tests/block_validation.cpp +++ b/tests/core_tests/block_validation.cpp @@ -79,7 +79,7 @@ bool gen_block_big_major_version::generate(std::vector& events BLOCK_VALIDATION_INIT_GENERATE(); block blk_1; - generator.construct_block_manually(blk_1, blk_0, miner_account, test_generator::bf_major_ver, CURRENT_BLOCK_MAJOR_VERSION + 1); + generator.construct_block_manually(blk_1, blk_0, miner_account, test_generator::bf_major_ver, 255); events.push_back(blk_1); DO_CALLBACK(events, "check_block_purged"); @@ -92,7 +92,7 @@ bool gen_block_big_minor_version::generate(std::vector& events BLOCK_VALIDATION_INIT_GENERATE(); block blk_1; - generator.construct_block_manually(blk_1, blk_0, miner_account, test_generator::bf_minor_ver, 0, CURRENT_BLOCK_MINOR_VERSION + 1); + generator.construct_block_manually(blk_1, blk_0, miner_account, test_generator::bf_minor_ver, 0, 255); events.push_back(blk_1); DO_CALLBACK(events, "check_block_accepted"); -- cgit v1.2.3 From 79beed221d9b3842b652587b5eaeed17423bd9de Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 25 Dec 2015 22:26:34 +0000 Subject: tests: fix various tests by using parameters better suited to monero Either smaller coin values (as monero has smaller block rewards), or pre-hard fork values (full reward zone), or post-Bytecoin values (emission speed). --- tests/core_tests/block_validation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/core_tests/block_validation.cpp') diff --git a/tests/core_tests/block_validation.cpp b/tests/core_tests/block_validation.cpp index 8589f07b8..6a16ee991 100644 --- a/tests/core_tests/block_validation.cpp +++ b/tests/core_tests/block_validation.cpp @@ -578,7 +578,7 @@ bool gen_block_invalid_binary_format::generate(std::vector& ev while (diffic < 1500); blk_last = boost::get(events.back()); - MAKE_TX(events, tx_0, miner_account, miner_account, MK_COINS(120), boost::get(events[1])); + MAKE_TX(events, tx_0, miner_account, miner_account, MK_COINS(30), boost::get(events[1])); DO_CALLBACK(events, "corrupt_blocks_boundary"); block blk_test; -- cgit v1.2.3