|
|
|
@ -57,8 +57,8 @@ bool gen_rct_tx_validation_base::generate_with(std::vector<test_event_entry>& ev
|
|
|
|
|
miner_accounts[n].generate();
|
|
|
|
|
CHECK_AND_ASSERT_MES(generator.construct_block_manually(blocks[n], *prev_block, miner_accounts[n],
|
|
|
|
|
test_generator::bf_major_ver | test_generator::bf_minor_ver | test_generator::bf_timestamp | test_generator::bf_hf_version,
|
|
|
|
|
3, 3, prev_block->timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), std::vector<crypto::hash>(), 0, 0, 3),
|
|
|
|
|
4, 4, prev_block->timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), std::vector<crypto::hash>(), 0, 0, 4),
|
|
|
|
|
false, "Failed to generate block");
|
|
|
|
|
events.push_back(blocks[n]);
|
|
|
|
|
prev_block = blocks + n;
|
|
|
|
@ -74,8 +74,8 @@ bool gen_rct_tx_validation_base::generate_with(std::vector<test_event_entry>& ev
|
|
|
|
|
cryptonote::block blk;
|
|
|
|
|
CHECK_AND_ASSERT_MES(generator.construct_block_manually(blk, blk_last, miner_account,
|
|
|
|
|
test_generator::bf_major_ver | test_generator::bf_minor_ver | test_generator::bf_timestamp | test_generator::bf_hf_version,
|
|
|
|
|
3, 3, blk_last.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), std::vector<crypto::hash>(), 0, 0, 3),
|
|
|
|
|
4, 4, blk_last.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), std::vector<crypto::hash>(), 0, 0, 4),
|
|
|
|
|
false, "Failed to generate block");
|
|
|
|
|
events.push_back(blk);
|
|
|
|
|
blk_last = blk;
|
|
|
|
@ -134,8 +134,8 @@ bool gen_rct_tx_validation_base::generate_with(std::vector<test_event_entry>& ev
|
|
|
|
|
|
|
|
|
|
CHECK_AND_ASSERT_MES(generator.construct_block_manually(blk_txes[n], blk_last, miner_account,
|
|
|
|
|
test_generator::bf_major_ver | test_generator::bf_minor_ver | test_generator::bf_timestamp | test_generator::bf_tx_hashes | test_generator::bf_hf_version,
|
|
|
|
|
3, 3, blk_last.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), starting_rct_tx_hashes, 0, 0, 3),
|
|
|
|
|
4, 4, blk_last.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), starting_rct_tx_hashes, 0, 0, 4),
|
|
|
|
|
false, "Failed to generate block");
|
|
|
|
|
events.push_back(blk_txes[n]);
|
|
|
|
|
blk_last = blk_txes[n];
|
|
|
|
@ -148,8 +148,8 @@ bool gen_rct_tx_validation_base::generate_with(std::vector<test_event_entry>& ev
|
|
|
|
|
cryptonote::block blk;
|
|
|
|
|
CHECK_AND_ASSERT_MES(generator.construct_block_manually(blk, blk_last, miner_account,
|
|
|
|
|
test_generator::bf_major_ver | test_generator::bf_minor_ver | test_generator::bf_timestamp | test_generator::bf_hf_version,
|
|
|
|
|
3, 3, blk_last.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), std::vector<crypto::hash>(), 0, 0, 3),
|
|
|
|
|
4, 4, blk_last.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
|
|
|
|
|
crypto::hash(), 0, transaction(), std::vector<crypto::hash>(), 0, 0, 4),
|
|
|
|
|
false, "Failed to generate block");
|
|
|
|
|
events.push_back(blk);
|
|
|
|
|
blk_last = blk;
|
|
|
|
|