diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-03 11:58:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-03 11:58:06 +0200 |
| commit | 13a84caa2254a98ea1de35f2d9771d606411043c (patch) | |
| tree | aca9d1f4547a3ded0d1f32b0f454dad063a845ea /tests/core_tests/block_validation.cpp | |
| parent | 4146f2e202206e7c5e288a47254e6ea055dc686d (diff) | |
| parent | 88ebfd646a5e75de0544958e88d152df86e310ec (diff) | |
| download | monzero-core-13a84caa2254a98ea1de35f2d9771d606411043c.tar.gz monzero-core-13a84caa2254a98ea1de35f2d9771d606411043c.tar.xz monzero-core-13a84caa2254a98ea1de35f2d9771d606411043c.zip | |
Merge pull request #2662
88ebfd64 core_tests: fix for subaddress patch (kenshi84)
e373a203 performance_tests: add master spend pubkey to subaddress hashtable (kenshi84)
Diffstat (limited to 'tests/core_tests/block_validation.cpp')
| -rw-r--r-- | tests/core_tests/block_validation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/core_tests/block_validation.cpp b/tests/core_tests/block_validation.cpp index 527059141..db44cd279 100644 --- a/tests/core_tests/block_validation.cpp +++ b/tests/core_tests/block_validation.cpp @@ -350,7 +350,7 @@ bool gen_block_miner_tx_has_2_in::generate(std::vector<test_event_entry>& events destinations.push_back(de); transaction tmp_tx; - if (!construct_tx(miner_account.get_keys(), sources, destinations, std::vector<uint8_t>(), tmp_tx, 0)) + if (!construct_tx(miner_account.get_keys(), sources, destinations, boost::none, std::vector<uint8_t>(), tmp_tx, 0)) return false; MAKE_MINER_TX_MANUALLY(miner_tx, blk_0); @@ -393,7 +393,7 @@ bool gen_block_miner_tx_with_txin_to_key::generate(std::vector<test_event_entry> destinations.push_back(de); transaction tmp_tx; - if (!construct_tx(miner_account.get_keys(), sources, destinations, std::vector<uint8_t>(), tmp_tx, 0)) + if (!construct_tx(miner_account.get_keys(), sources, destinations, boost::none, std::vector<uint8_t>(), tmp_tx, 0)) return false; MAKE_MINER_TX_MANUALLY(miner_tx, blk_1); |