diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-08-02 11:23:16 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-08-02 11:16:24 -0400 |
| commit | fa76285fddac613c518e73b35a7486ad2ab4b992 (patch) | |
| tree | a02dac7841309a00c5d120e40c542cb19730e7f3 /test/functional | |
| parent | faff85a69a5eb0fdfd8d9a24bc27d1812e49a152 (diff) | |
| download | bitcoin-fa76285fddac613c518e73b35a7486ad2ab4b992.tar.xz | |
test: Explain why -whitelist is used in feature_fee_estimation
Also, Remove seemingly unused and undocumented -maxorphantx=1000
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/feature_fee_estimation.py | 11 | ||||
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py index ca2879bae5..d2d41b1206 100755 --- a/test/functional/feature_fee_estimation.py +++ b/test/functional/feature_fee_estimation.py @@ -128,10 +128,11 @@ class EstimateFeeTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 3 # mine non-standard txs (e.g. txs with "dust" outputs) + # Force fSendTrickle to true (via whitelist) self.extra_args = [ - ["-acceptnonstdtxn", "-maxorphantx=1000", "-whitelist=127.0.0.1"], - ["-acceptnonstdtxn", "-blockmaxweight=68000", "-maxorphantx=1000"], - ["-acceptnonstdtxn", "-blockmaxweight=32000", "-maxorphantx=1000"], + ["-acceptnonstdtxn", "-whitelist=127.0.0.1"], + ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=68000"], + ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=32000"], ] def skip_test_if_missing_module(self): @@ -168,9 +169,9 @@ class EstimateFeeTest(BitcoinTestFramework): self.memutxo, Decimal("0.005"), min_fee, min_fee) tx_kbytes = (len(txhex) // 2) / 1000.0 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"] - self.sync_blocks(self.nodes[0:3], wait=.1) + self.sync_blocks(wait=.1) # update which txouts are confirmed newmem = [] for utx in self.memutxo: diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 7ad2b78d4e..3f5d76767f 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -76,7 +76,6 @@ EXTENDED_SCRIPTS = [ BASE_SCRIPTS = [ # Scripts that are run by default. # Longest test should go first, to favor running tests in parallel - 'feature_fee_estimation.py', 'wallet_hd.py', 'wallet_backup.py', # vv Tests less than 5m vv @@ -110,6 +109,7 @@ BASE_SCRIPTS = [ 'feature_abortnode.py', # vv Tests less than 30s vv 'wallet_keypool_topup.py', + 'feature_fee_estimation.py', 'interface_zmq.py', 'interface_bitcoin_cli.py', 'mempool_resurrect.py', |