From 417dafc1ee07af3319c2fe89758123cb8362ff16 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Fri, 18 Dec 2020 15:39:32 -0500 Subject: [PATCH] validation: Remove old AcceptToMemoryPool w/o chainstate param --- src/validation.cpp | 5 ----- src/validation.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index e40a273257e..0b4f0dbb4ce 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1101,11 +1101,6 @@ static MempoolAcceptResult AcceptToMemoryPoolWithTime(const CChainParams& chainp return result; } -MempoolAcceptResult AcceptToMemoryPool(CTxMemPool& pool, const CTransactionRef &tx, bool bypass_limits, bool test_accept) -{ - return AcceptToMemoryPool(::ChainstateActive(), pool, tx, bypass_limits, test_accept); -} - MempoolAcceptResult AcceptToMemoryPool(CChainState& active_chainstate, CTxMemPool& pool, const CTransactionRef& tx, bool bypass_limits, bool test_accept) { assert(std::addressof(::ChainstateActive()) == std::addressof(active_chainstate)); diff --git a/src/validation.h b/src/validation.h index 80ef0eaa7de..739f4f1d996 100644 --- a/src/validation.h +++ b/src/validation.h @@ -223,8 +223,6 @@ struct MempoolAcceptResult { * @param[in] bypass_limits When true, don't enforce mempool fee limits. * @param[in] test_accept When true, run validation checks but don't submit to mempool. */ -MempoolAcceptResult AcceptToMemoryPool(CTxMemPool& pool, const CTransactionRef& tx, - bool bypass_limits, bool test_accept=false) EXCLUSIVE_LOCKS_REQUIRED(cs_main); MempoolAcceptResult AcceptToMemoryPool(CChainState& active_chainstate, CTxMemPool& pool, const CTransactionRef& tx, bool bypass_limits, bool test_accept=false) EXCLUSIVE_LOCKS_REQUIRED(cs_main);