Merge pull request #638

6827061 tests: fix compilation failure after V1 define rename (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-02-08 18:28:37 +02:00
commit f6dcefd80f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -505,7 +505,7 @@ bool gen_block_is_too_big::generate(std::vector<test_event_entry>& events) const
// Creating a huge miner_tx, it will have a lot of outs // Creating a huge miner_tx, it will have a lot of outs
MAKE_MINER_TX_MANUALLY(miner_tx, blk_0); MAKE_MINER_TX_MANUALLY(miner_tx, blk_0);
static const size_t tx_out_count = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE / 2; static const size_t tx_out_count = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V1 / 2;
uint64_t amount = get_outs_money_amount(miner_tx); uint64_t amount = get_outs_money_amount(miner_tx);
uint64_t portion = amount / tx_out_count; uint64_t portion = amount / tx_out_count;
uint64_t remainder = amount % tx_out_count; uint64_t remainder = amount % tx_out_count;