From 073a12f0ff564f7b5e6e1ebeed0c0d71834a5bed Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 5 Sep 2019 16:15:21 +0300 Subject: [PATCH] minor fixes --- .../currency_format_utils_transactions.cpp | 2 +- tests/core_tests/chaingen.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/currency_core/currency_format_utils_transactions.cpp b/src/currency_core/currency_format_utils_transactions.cpp index f78ebf16..ba08914b 100644 --- a/src/currency_core/currency_format_utils_transactions.cpp +++ b/src/currency_core/currency_format_utils_transactions.cpp @@ -88,7 +88,7 @@ namespace currency return 0; CHECK_AND_ASSERT_THROW_MES(ut2.unlock_time_array.size() > o_i, "unlock_time_array.size=" << ut2.unlock_time_array.size() - << " is less then o_i=" << o_i << " in tx: " << get_transaction_hash(tx)); + << " is less or equal to o_i=" << o_i << " in tx: " << get_transaction_hash(tx)); return ut2.unlock_time_array[o_i]; } diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h index 27e1deec..a7696afc 100644 --- a/tests/core_tests/chaingen.h +++ b/tests/core_tests/chaingen.h @@ -1124,13 +1124,13 @@ void append_vector_by_another_vector(U& dst, const V& src) #define MAKE_TX_ATTACH(EVENTS, TX_VAR, FROM, TO, AMOUNT, HEAD, ATTACH) MAKE_TX_ATTACH_FEE(EVENTS, TX_VAR, FROM, TO, AMOUNT, TESTS_DEFAULT_FEE, HEAD, ATTACH) -#define MAKE_MINER_TX_AND_KEY_MANUALLY(TX, BLK, KEY) \ - transaction TX; \ - if (!construct_miner_tx_manually(get_block_height(BLK) + 1, generator.get_already_generated_coins(BLK), \ - miner_account.get_keys().m_account_address, TX, 0, KEY)) \ +#define MAKE_MINER_TX_AND_KEY_MANUALLY(TX, PREV_BLOCK, P_KEYPAIR) \ + transaction TX; \ + if (!construct_miner_tx_manually(get_block_height(PREV_BLOCK) + 1, generator.get_already_generated_coins(PREV_BLOCK), \ + miner_account.get_keys().m_account_address, TX, 0, P_KEYPAIR)) \ return false; -#define MAKE_MINER_TX_MANUALLY(TX, BLK) MAKE_MINER_TX_AND_KEY_MANUALLY(TX, BLK, 0) +#define MAKE_MINER_TX_MANUALLY(TX, PREV_BLOCK) MAKE_MINER_TX_AND_KEY_MANUALLY(TX, PREV_BLOCK, nullptr) #define SET_EVENT_VISITOR_SETT(VEC_EVENTS, SETT, VAL) VEC_EVENTS.push_back(event_visitor_settings(SETT, VAL));