Merge pull request #1581

6da9335a blockchain_import: fix build after tx_pool::add_tx changes (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-15 19:13:28 -05:00
commit 422a36ca2a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -472,7 +472,7 @@ int import_from_file(FakeCore& simple_core, const std::string& import_file_path,
uint8_t version = simple_core.m_storage.get_current_hard_fork_version(); uint8_t version = simple_core.m_storage.get_current_hard_fork_version();
tx_verification_context tvc = AUTO_VAL_INIT(tvc); tx_verification_context tvc = AUTO_VAL_INIT(tvc);
bool r = true; bool r = true;
r = simple_core.m_pool.add_tx(tx, tvc, true, true, version); r = simple_core.m_pool.add_tx(tx, tvc, true, true, false, version);
if (!r) if (!r)
{ {
LOG_PRINT_RED_L0("failed to add transaction to transaction pool, height=" << h <<", tx_num=" << tx_num); LOG_PRINT_RED_L0("failed to add transaction to transaction pool, height=" << h <<", tx_num=" << tx_num);