From 33b8614e273a756173c466aa1b243cea84ff45a3 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Fri, 5 Apr 2019 12:43:14 -0400 Subject: [PATCH] optimize fee estimation test, re-include in regular list --- test/functional/feature_fee_estimation.py | 6 +++--- test/functional/test_runner.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py index 77e553b53e5..fb7806a320e 100755 --- a/test/functional/feature_fee_estimation.py +++ b/test/functional/feature_fee_estimation.py @@ -137,9 +137,9 @@ def setup_network(self): But first we need to use one node to create a lot of outputs which we will use to generate our transactions. """ - self.add_nodes(3, extra_args=[["-maxorphantx=1000", "-whitelist=127.0.0.1"], - ["-blockmaxweight=68000", "-maxorphantx=1000"], - ["-blockmaxweight=32000", "-maxorphantx=1000"]]) + self.add_nodes(3, extra_args=[["-maxorphantx=1000", "-whitelist=127.0.0.1", "-checkmempool=0"], + ["-blockmaxweight=68000", "-maxorphantx=1000", "-checkmempool=0"], + ["-blockmaxweight=32000", "-maxorphantx=1000", "-checkmempool=0"]]) # Use node0 to mine blocks for input splitting # Node1 mines small blocks but that are bigger than the expected transaction rate. # NOTE: the CreateNewBlock code starts counting block weight at 4,000 weight, diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 3021ce05506..b2e93795a08 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -75,6 +75,7 @@ 'feature_initial_reissuance_token.py', 'feature_progress.py', # 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 @@ -196,7 +197,6 @@ # Longest test should go first, to favor running tests in parallel 'feature_pruning.py', 'feature_dbcrash.py', - 'feature_fee_estimation.py', ]