diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2023-12-15 03:28:34 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2024-05-06 20:34:10 +0000 |
commit | cc67d33fdac45357b593b1faff3d1735e5fe91ba (patch) | |
tree | 3659bd571a30b8e90c549789740b36df1e965470 /src/kernel/mempool_persist.cpp | |
parent | 63d0b930f821132badd804822a46232a5f98bbef (diff) | |
download | bitcoin-cc67d33fdac45357b593b1faff3d1735e5fe91ba.tar.xz |
refactor: Simply include CTxMemPool::Options in CTxMemPool directly rather than duplicating definition
Diffstat (limited to 'src/kernel/mempool_persist.cpp')
-rw-r--r-- | src/kernel/mempool_persist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/mempool_persist.cpp b/src/kernel/mempool_persist.cpp index f06f609379..53028a45ae 100644 --- a/src/kernel/mempool_persist.cpp +++ b/src/kernel/mempool_persist.cpp @@ -96,7 +96,7 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active if (amountdelta && opts.apply_fee_delta_priority) { pool.PrioritiseTransaction(tx->GetHash(), amountdelta); } - if (nTime > TicksSinceEpoch<std::chrono::seconds>(now - pool.m_expiry)) { + if (nTime > TicksSinceEpoch<std::chrono::seconds>(now - pool.m_opts.expiry)) { LOCK(cs_main); const auto& accepted = AcceptToMemoryPool(active_chainstate, tx, nTime, /*bypass_limits=*/false, /*test_accept=*/false); if (accepted.m_result_type == MempoolAcceptResult::ResultType::VALID) { @@ -174,11 +174,11 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock } try { - const uint64_t version{pool.m_persist_v1_dat ? MEMPOOL_DUMP_VERSION_NO_XOR_KEY : MEMPOOL_DUMP_VERSION}; + const uint64_t version{pool.m_opts.persist_v1_dat ? MEMPOOL_DUMP_VERSION_NO_XOR_KEY : MEMPOOL_DUMP_VERSION}; file << version; std::vector<std::byte> xor_key(8); - if (!pool.m_persist_v1_dat) { + if (!pool.m_opts.persist_v1_dat) { FastRandomContext{}.fillrand(xor_key); file << xor_key; } |