lthn/blockchain
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed hard_fork_2_no_new_structures_before_hf

Browse source
This commit is contained in:
cryptozoidberg 2021-03-12 17:20:11 +03:00
parent 91648cbcf2
commit a3ca1edcd6
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/core_tests/hard_fork_2.cpp
View file

@ -754,6 +754,7 @@ bool hard_fork_2_no_new_structures_before_hf::generate(std::vector<test_event_en
tx_payer payer = AUTO_VAL_INIT(payer);
payer.acc_addr = miner_acc.get_public_address();
extra.push_back(payer);
DO_CALLBACK(events, "mark_invalid_tx");
MAKE_TX_MIX_ATTR_EXTRA(events, tx_0, miner_acc, alice_acc, MK_TEST_COINS(1), 0, blk_0r, 0, extra, true);
// blk_1b_1 is invalid as containing tx_0
@ -775,6 +776,7 @@ bool hard_fork_2_no_new_structures_before_hf::generate(std::vector<test_event_en
tx_receiver receiver = AUTO_VAL_INIT(receiver);
receiver.acc_addr = miner_acc.get_public_address();
extra.push_back(receiver);
DO_CALLBACK(events, "mark_invalid_tx");
MAKE_TX_MIX_ATTR_EXTRA(events, tx_1, miner_acc, alice_acc, MK_TEST_COINS(1), 0, blk_1, 0, extra, true);
// blk_1b_2 is invalid as containing tx_1
@ -797,6 +799,7 @@ bool hard_fork_2_no_new_structures_before_hf::generate(std::vector<test_event_en
alias_entry.m_alias = "minerminer";
std::list<transaction> tx_set;
DO_CALLBACK(events, "mark_invalid_tx");
r = put_alias_via_tx_to_list(events, tx_set, blk_2, miner_acc, alias_entry, generator);
CHECK_AND_ASSERT_MES(r, false, "put_alias_via_tx_to_list failed");
transaction tx_2 = tx_set.front();
@ -824,6 +827,10 @@ bool hard_fork_2_no_new_structures_before_hf::generate(std::vector<test_event_en
MAKE_NEXT_BLOCK(events, blk_6, blk_5, miner_acc);
MAKE_NEXT_BLOCK(events, blk_7, blk_6, miner_acc);
events.push_back(tx_0);
events.push_back(tx_1);
events.push_back(tx_2);
// tx_0 with tx_payer should be accepted after HF2
MAKE_NEXT_BLOCK_TX1(events, blk_8, blk_7, miner_acc, tx_0);