Skip to content

Commit ad82cb0

Browse files
committed
Remove unnecessary min fee argument in CTxMemPool constructor
1 parent 2a7b56c commit ad82cb0

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

src/bench/mempool_eviction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static void MempoolEviction(benchmark::State& state)
9797
tx7.vout[1].scriptPubKey = CScript() << OP_7 << OP_EQUAL;
9898
tx7.vout[1].nValue = 10 * COIN;
9999

100-
CTxMemPool pool(CFeeRate(1000));
100+
CTxMemPool pool;
101101

102102
while (state.KeepRunning()) {
103103
AddTx(tx1, 10000LL, pool);

src/test/blockencodings_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static CBlock BuildBlockTestCase() {
5555

5656
BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
5757
{
58-
CTxMemPool pool(CFeeRate(0));
58+
CTxMemPool pool;
5959
TestMemPoolEntryHelper entry;
6060
CBlock block(BuildBlockTestCase());
6161

@@ -154,7 +154,7 @@ class TestHeaderAndShortIDs {
154154

155155
BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
156156
{
157-
CTxMemPool pool(CFeeRate(0));
157+
CTxMemPool pool;
158158
TestMemPoolEntryHelper entry;
159159
CBlock block(BuildBlockTestCase());
160160

@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
220220

221221
BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
222222
{
223-
CTxMemPool pool(CFeeRate(0));
223+
CTxMemPool pool;
224224
TestMemPoolEntryHelper entry;
225225
CBlock block(BuildBlockTestCase());
226226

@@ -270,7 +270,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
270270

271271
BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
272272
{
273-
CTxMemPool pool(CFeeRate(0));
273+
CTxMemPool pool;
274274
CMutableTransaction coinbase;
275275
coinbase.vin.resize(1);
276276
coinbase.vin[0].scriptSig.resize(10);

src/test/mempool_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
5454
}
5555

5656

57-
CTxMemPool testPool(CFeeRate(0));
57+
CTxMemPool testPool;
5858

5959
// Nothing in pool, remove should do nothing:
6060
unsigned int poolSize = testPool.size();
@@ -118,7 +118,7 @@ void CheckSort(CTxMemPool &pool, std::vector<std::string> &sortedOrder)
118118

119119
BOOST_AUTO_TEST_CASE(MempoolIndexingTest)
120120
{
121-
CTxMemPool pool(CFeeRate(0));
121+
CTxMemPool pool;
122122
TestMemPoolEntryHelper entry;
123123

124124
/* 3rd highest fee */
@@ -320,7 +320,7 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest)
320320

321321
BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
322322
{
323-
CTxMemPool pool(CFeeRate(0));
323+
CTxMemPool pool;
324324
TestMemPoolEntryHelper entry;
325325

326326
/* 3rd highest fee */
@@ -432,7 +432,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
432432

433433
BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
434434
{
435-
CTxMemPool pool(CFeeRate(1000));
435+
CTxMemPool pool;
436436
TestMemPoolEntryHelper entry;
437437
entry.dPriority = 10.0;
438438

src/test/policyestimator_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BOOST_FIXTURE_TEST_SUITE(policyestimator_tests, BasicTestingSetup)
1616

1717
BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
1818
{
19-
CTxMemPool mpool(CFeeRate(1000));
19+
CTxMemPool mpool;
2020
TestMemPoolEntryHelper entry;
2121
CAmount basefee(2000);
2222
CAmount deltaFee(100);

src/txmempool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee,
348348
assert(int(nSigOpCostWithAncestors) >= 0);
349349
}
350350

351-
CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) :
351+
CTxMemPool::CTxMemPool() :
352352
nTransactionsUpdated(0)
353353
{
354354
_clear(); //lock free clear

src/txmempool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ class CTxMemPool
502502

503503
/** Create a new CTxMemPool.
504504
*/
505-
CTxMemPool(const CFeeRate& _minReasonableRelayFee);
505+
CTxMemPool();
506506
~CTxMemPool();
507507

508508
/**

src/validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ uint256 hashAssumeValid;
8383
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
8484
CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
8585

86-
CTxMemPool mempool(::minRelayTxFee);
86+
CTxMemPool mempool;
8787

8888
static void CheckBlockIndex(const Consensus::Params& consensusParams);
8989

0 commit comments

Comments
 (0)