LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

test: Explain why -whitelist is used in feature_fee_estimation

Browse source 
Also, Remove seemingly unused and undocumented -maxorphantx=1000
This commit is contained in:
MarcoFalke 2019-08-02 11:23:16 -04:00
parent faff85a69a
commit fa76285fdd
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/functional/feature_fee_estimation.py
View file

@ -128,10 +128,11 @@ class EstimateFeeTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.num_nodes = 3 self.num_nodes = 3
# mine non-standard txs (e.g. txs with "dust" outputs) # mine non-standard txs (e.g. txs with "dust" outputs)
# Force fSendTrickle to true (via whitelist)
self.extra_args = [ self.extra_args = [
["-acceptnonstdtxn", "-maxorphantx=1000", "-whitelist=127.0.0.1"], ["-acceptnonstdtxn", "-whitelist=127.0.0.1"],
["-acceptnonstdtxn", "-blockmaxweight=68000", "-maxorphantx=1000"], ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=68000"],
["-acceptnonstdtxn", "-blockmaxweight=32000", "-maxorphantx=1000"], ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=32000"],
] ]
def skip_test_if_missing_module(self): def skip_test_if_missing_module(self):
@ -168,9 +169,9 @@ class EstimateFeeTest(BitcoinTestFramework):
self.memutxo, Decimal("0.005"), min_fee, min_fee) self.memutxo, Decimal("0.005"), min_fee, min_fee)
tx_kbytes = (len(txhex) // 2) / 1000.0 tx_kbytes = (len(txhex) // 2) / 1000.0
self.fees_per_kb.append(float(fee) / tx_kbytes) self.fees_per_kb.append(float(fee) / tx_kbytes)
self.sync_mempools(self.nodes[0:3], wait=.1) self.sync_mempools(wait=.1)
mined = mining_node.getblock(mining_node.generate(1)[0], True)["tx"] mined = mining_node.getblock(mining_node.generate(1)[0], True)["tx"]
self.sync_blocks(self.nodes[0:3], wait=.1) self.sync_blocks(wait=.1)
# update which txouts are confirmed # update which txouts are confirmed
newmem = [] newmem = []
for utx in self.memutxo: for utx in self.memutxo:

2
test/functional/test_runner.py
View file

@ -76,7 +76,6 @@ EXTENDED_SCRIPTS = [
BASE_SCRIPTS = [ BASE_SCRIPTS = [
# Scripts that are run by default. # Scripts that are run by default.
# Longest test should go first, to favor running tests in parallel # Longest test should go first, to favor running tests in parallel
'feature_fee_estimation.py',
'wallet_hd.py', 'wallet_hd.py',
'wallet_backup.py', 'wallet_backup.py',
# vv Tests less than 5m vv # vv Tests less than 5m vv
@ -110,6 +109,7 @@ BASE_SCRIPTS = [
'feature_abortnode.py', 'feature_abortnode.py',
# vv Tests less than 30s vv # vv Tests less than 30s vv
'wallet_keypool_topup.py', 'wallet_keypool_topup.py',
'feature_fee_estimation.py',
'interface_zmq.py', 'interface_zmq.py',
'interface_bitcoin_cli.py', 'interface_bitcoin_cli.py',
'mempool_resurrect.py', 'mempool_resurrect.py',