diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-05-17 19:07:28 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-05-17 19:07:28 +0200 |
| commit | e54e4d96a462bc388e9c91159b60459b125b21ff (patch) | |
| tree | 910c2e1a79ca5ef83172a722147ba6a42f2a037d /tests/core_tests/chaingen.cpp | |
| parent | ae205020f6f17f12b75a69240c4fcbbee72d30af (diff) | |
| parent | 9ef8c7b694f8f00c8a70e05ff88a5768b8f78a3c (diff) | |
| download | monzero-core-e54e4d96a462bc388e9c91159b60459b125b21ff.tar.gz monzero-core-e54e4d96a462bc388e9c91159b60459b125b21ff.tar.xz monzero-core-e54e4d96a462bc388e9c91159b60459b125b21ff.zip | |
Merge pull request #831
9ef8c7b tests: fix tests broken by the removal of the block reward accumulation loop (moneromooo-monero)
a6e717e cn_deserialize: deserialize tx_extra too (moneromooo-monero)
3eff37f unit_tests: add a write_varint/read_varint test (moneromooo-monero)
7a66387 unit_tests: fix UNBOUND_LIBRARIES/UNBOUND_LIBRARY typo (moneromooo-monero)
d6bce4b core: move tx_extra parsing errors to log level 1 (moneromooo-monero)
Diffstat (limited to 'tests/core_tests/chaingen.cpp')
| -rw-r--r-- | tests/core_tests/chaingen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/core_tests/chaingen.cpp b/tests/core_tests/chaingen.cpp index 4fdd0a600..efd0bf1ea 100644 --- a/tests/core_tests/chaingen.cpp +++ b/tests/core_tests/chaingen.cpp @@ -222,7 +222,7 @@ bool test_generator::construct_block_manually(block& blk, const block& prev_bloc blk.timestamp = actual_params & bf_timestamp ? timestamp : prev_block.timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN; // Keep difficulty unchanged blk.prev_id = actual_params & bf_prev_id ? prev_id : get_block_hash(prev_block); blk.tx_hashes = actual_params & bf_tx_hashes ? tx_hashes : std::vector<crypto::hash>(); - max_outs = actual_params & bf_max_outs ? max_outs : 1; + max_outs = actual_params & bf_max_outs ? max_outs : 9999; size_t height = get_block_height(prev_block) + 1; uint64_t already_generated_coins = get_already_generated_coins(prev_block); |
