Skip to content

Commit fa76285

Browse files
author
MarcoFalke
committed
test: Explain why -whitelist is used in feature_fee_estimation
Also, Remove seemingly unused and undocumented -maxorphantx=1000
1 parent faff85a commit fa76285

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

test/functional/feature_fee_estimation.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,11 @@ class EstimateFeeTest(BitcoinTestFramework):
128128
def set_test_params(self):
129129
self.num_nodes = 3
130130
# mine non-standard txs (e.g. txs with "dust" outputs)
131+
# Force fSendTrickle to true (via whitelist)
131132
self.extra_args = [
132-
["-acceptnonstdtxn", "-maxorphantx=1000", "-whitelist=127.0.0.1"],
133-
["-acceptnonstdtxn", "-blockmaxweight=68000", "-maxorphantx=1000"],
134-
["-acceptnonstdtxn", "-blockmaxweight=32000", "-maxorphantx=1000"],
133+
["-acceptnonstdtxn", "-whitelist=127.0.0.1"],
134+
["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=68000"],
135+
["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=32000"],
135136
]
136137

137138
def skip_test_if_missing_module(self):
@@ -168,9 +169,9 @@ def transact_and_mine(self, numblocks, mining_node):
168169
self.memutxo, Decimal("0.005"), min_fee, min_fee)
169170
tx_kbytes = (len(txhex) // 2) / 1000.0
170171
self.fees_per_kb.append(float(fee) / tx_kbytes)
171-
self.sync_mempools(self.nodes[0:3], wait=.1)
172+
self.sync_mempools(wait=.1)
172173
mined = mining_node.getblock(mining_node.generate(1)[0], True)["tx"]
173-
self.sync_blocks(self.nodes[0:3], wait=.1)
174+
self.sync_blocks(wait=.1)
174175
# update which txouts are confirmed
175176
newmem = []
176177
for utx in self.memutxo:

test/functional/test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
BASE_SCRIPTS = [
7777
# Scripts that are run by default.
7878
# Longest test should go first, to favor running tests in parallel
79-
'feature_fee_estimation.py',
8079
'wallet_hd.py',
8180
'wallet_backup.py',
8281
# vv Tests less than 5m vv
@@ -110,6 +109,7 @@
110109
'feature_abortnode.py',
111110
# vv Tests less than 30s vv
112111
'wallet_keypool_topup.py',
112+
'feature_fee_estimation.py',
113113
'interface_zmq.py',
114114
'interface_bitcoin_cli.py',
115115
'mempool_resurrect.py',

0 commit comments

Comments
 (0)