diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-01 18:27:08 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-01 19:01:52 +0100 |
commit | 987a80995a69578f0645eb107689fca908819729 (patch) | |
tree | 9e6e159cd9c0e43bd4c0a1fc797741bea5e42e8a /test/functional/test_runner.py | |
parent | 5c2aff8d95a932f82a9472975b1d183da6c99e5f (diff) | |
parent | 3f592b81dcca3d2ef11403a623a6ba5b017567d7 (diff) | |
download | bitcoin-987a80995a69578f0645eb107689fca908819729.tar.xz |
Merge #11882: Disable default fallbackfee on mainnet
3f592b8 [QA] add wallet-rbf test (Jonas Schnelli)
8222e05 Disable wallet fallbackfee by default on mainnet (Jonas Schnelli)
Pull request description:
Removes the default fallback fee on mainnet (but keeps it on testnet/regtest).
Transactions using the fallbackfee in case the fallback fee has not been set are getting rejected.
Tree-SHA512: e54d2594b7f954e640cc513a18b0bfbe189f15e15bdeed4fe02b7677f939bca1731fef781b073127ffd4ce08a595fb118259b8826cdaa077ff7d5ae9495810db
Diffstat (limited to 'test/functional/test_runner.py')
-rwxr-xr-x | test/functional/test_runner.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 945f645eac..082191098e 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -126,6 +126,7 @@ BASE_SCRIPTS= [ 'feature_cltv.py', 'rpc_uptime.py', 'wallet_resendwallettransactions.py', + 'wallet_fallbackfee.py', 'feature_minchainwork.py', 'p2p_fingerprint.py', 'feature_uacomment.py', |