Skip to content

Commit a08533c

Browse files
author
MarcoFalke
committed
Merge #13913: qa: Remove redundant checkmempool/checkblockindex extra_args
fa31ca0 qa: Remove redundant checkmempool/checkblockindex extra_args (MarcoFalke) Pull request description: They are already enabled by default for regtest: https://github.com/bitcoin/bitcoin/blob/df9f71274645a917e2578c52a1c59745bce8112d/src/init.cpp#L1002-L1007 Closes #13912. CC #12138 Tree-SHA512: b11a3e8cc4715569f917ab89132f8c8dcae64aebcd7a34182675f86cf7f6e207e3187b7ea01a56c92c8c3af76122b6b995e84f533e134676863f8953dc1f0574
2 parents d6faea4 + fa31ca0 commit a08533c

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

test/functional/feature_reindex.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def reindex(self, justchainstate=False):
2222
self.nodes[0].generate(3)
2323
blockcount = self.nodes[0].getblockcount()
2424
self.stop_nodes()
25-
extra_args = [["-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"]]
25+
extra_args = [["-reindex-chainstate" if justchainstate else "-reindex"]]
2626
self.start_nodes(extra_args)
2727
wait_until(lambda: self.nodes[0].getblockcount() == blockcount)
2828
self.log.info("Success")

test/functional/mempool_accept.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class MempoolAcceptanceTest(BitcoinTestFramework):
3535
def set_test_params(self):
3636
self.num_nodes = 1
3737
self.extra_args = [[
38-
'-checkmempool',
3938
'-txindex',
4039
'-reindex', # Need reindex for txindex
4140
'-acceptnonstdtxn=0', # Try to mimic main-net

test/functional/mempool_reorg.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
from test_framework.blocktools import create_raw_transaction
1313
from test_framework.util import *
1414

15-
# Create one-input, one-output, no-fee transaction:
15+
1616
class MempoolCoinbaseTest(BitcoinTestFramework):
1717
def set_test_params(self):
1818
self.num_nodes = 2
19-
self.extra_args = [["-checkmempool"]] * 2
2019

2120
alert_filename = None # Set by setup_network
2221

test/functional/mempool_resurrect.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
from test_framework.blocktools import create_raw_transaction
99
from test_framework.util import *
1010

11-
# Create one-input, one-output, no-fee transaction:
11+
1212
class MempoolCoinbaseTest(BitcoinTestFramework):
1313
def set_test_params(self):
1414
self.num_nodes = 1
15-
self.extra_args = [["-checkmempool"]]
1615

1716
def run_test(self):
1817
node0_address = self.nodes[0].getnewaddress()

test/functional/mempool_spend_coinbase.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
from test_framework.blocktools import create_raw_transaction
1717
from test_framework.util import *
1818

19-
# Create one-input, one-output, no-fee transaction:
19+
2020
class MempoolSpendCoinbaseTest(BitcoinTestFramework):
2121
def set_test_params(self):
2222
self.num_nodes = 1
23-
self.extra_args = [["-checkmempool"]]
2423

2524
def run_test(self):
2625
chain_height = self.nodes[0].getblockcount()

0 commit comments

Comments
 (0)