Browse Source

Remove unnecessary min fee argument in CTxMemPool constructor

pull/1/head
Alex Morcos 6 years ago
parent
commit
ad82cb06ce
  1. 2
      src/bench/mempool_eviction.cpp
  2. 8
      src/test/blockencodings_tests.cpp
  3. 8
      src/test/mempool_tests.cpp
  4. 2
      src/test/policyestimator_tests.cpp
  5. 2
      src/txmempool.cpp
  6. 2
      src/txmempool.h
  7. 2
      src/validation.cpp

2
src/bench/mempool_eviction.cpp

@ -97,7 +97,7 @@ static void MempoolEviction(benchmark::State& state) @@ -97,7 +97,7 @@ static void MempoolEviction(benchmark::State& state)
tx7.vout[1].scriptPubKey = CScript() << OP_7 << OP_EQUAL;
tx7.vout[1].nValue = 10 * COIN;
CTxMemPool pool(CFeeRate(1000));
CTxMemPool pool;
while (state.KeepRunning()) {
AddTx(tx1, 10000LL, pool);

8
src/test/blockencodings_tests.cpp

@ -55,7 +55,7 @@ static CBlock BuildBlockTestCase() { @@ -55,7 +55,7 @@ static CBlock BuildBlockTestCase() {
BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
{
CTxMemPool pool(CFeeRate(0));
CTxMemPool pool;
TestMemPoolEntryHelper entry;
CBlock block(BuildBlockTestCase());
@ -154,7 +154,7 @@ public: @@ -154,7 +154,7 @@ public:
BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
{
CTxMemPool pool(CFeeRate(0));
CTxMemPool pool;
TestMemPoolEntryHelper entry;
CBlock block(BuildBlockTestCase());
@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) @@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
{
CTxMemPool pool(CFeeRate(0));
CTxMemPool pool;
TestMemPoolEntryHelper entry;
CBlock block(BuildBlockTestCase());
@ -270,7 +270,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest) @@ -270,7 +270,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
{
CTxMemPool pool(CFeeRate(0));
CTxMemPool pool;
CMutableTransaction coinbase;
coinbase.vin.resize(1);
coinbase.vin[0].scriptSig.resize(10);

8
src/test/mempool_tests.cpp

@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest) @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
}
CTxMemPool testPool(CFeeRate(0));
CTxMemPool testPool;
// Nothing in pool, remove should do nothing:
unsigned int poolSize = testPool.size();
@ -118,7 +118,7 @@ void CheckSort(CTxMemPool &pool, std::vector<std::string> &sortedOrder) @@ -118,7 +118,7 @@ void CheckSort(CTxMemPool &pool, std::vector<std::string> &sortedOrder)
BOOST_AUTO_TEST_CASE(MempoolIndexingTest)
{
CTxMemPool pool(CFeeRate(0));
CTxMemPool pool;
TestMemPoolEntryHelper entry;
/* 3rd highest fee */
@ -320,7 +320,7 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest) @@ -320,7 +320,7 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest)
BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
{
CTxMemPool pool(CFeeRate(0));
CTxMemPool pool;
TestMemPoolEntryHelper entry;
/* 3rd highest fee */
@ -432,7 +432,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) @@ -432,7 +432,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
{
CTxMemPool pool(CFeeRate(1000));
CTxMemPool pool;
TestMemPoolEntryHelper entry;
entry.dPriority = 10.0;

2
src/test/policyestimator_tests.cpp

@ -16,7 +16,7 @@ BOOST_FIXTURE_TEST_SUITE(policyestimator_tests, BasicTestingSetup) @@ -16,7 +16,7 @@ BOOST_FIXTURE_TEST_SUITE(policyestimator_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
{
CTxMemPool mpool(CFeeRate(1000));
CTxMemPool mpool;
TestMemPoolEntryHelper entry;
CAmount basefee(2000);
CAmount deltaFee(100);

2
src/txmempool.cpp

@ -348,7 +348,7 @@ void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee, @@ -348,7 +348,7 @@ void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee,
assert(int(nSigOpCostWithAncestors) >= 0);
}
CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) :
CTxMemPool::CTxMemPool() :
nTransactionsUpdated(0)
{
_clear(); //lock free clear

2
src/txmempool.h

@ -502,7 +502,7 @@ public: @@ -502,7 +502,7 @@ public:
/** Create a new CTxMemPool.
*/
CTxMemPool(const CFeeRate& _minReasonableRelayFee);
CTxMemPool();
~CTxMemPool();
/**

2
src/validation.cpp

@ -83,7 +83,7 @@ uint256 hashAssumeValid; @@ -83,7 +83,7 @@ uint256 hashAssumeValid;
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
CTxMemPool mempool(::minRelayTxFee);
CTxMemPool mempool;
static void CheckBlockIndex(const Consensus::Params& consensusParams);

Loading…
Cancel
Save