diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-26 15:27:58 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-26 15:30:27 +0200 |
| commit | ec7dbaa37c233599e9fc68f8284ee85c1261652b (patch) | |
| tree | add6cd9a1741fcaa5af368952b2a3ab5f8fd02a5 /test/functional/feature_fee_estimation.py | |
| parent | 25cf18f239f0d812fe458435d064e522a6cab5f8 (diff) | |
| parent | 4757c04cb98df2ab3a54c7e33ff9af3b1f7dc78b (diff) | |
| download | bitcoin-ec7dbaa37c233599e9fc68f8284ee85c1261652b.tar.xz | |
Merge #12756: [config] Remove blockmaxsize option
4757c04 [config] Remove blockmaxsize option (John Newbery)
Pull request description:
The blockmaxsize option was marked as deprecated in V0.15.1, and code
was added to convert provided blockmaxsize into blockmaxweight. However,
this code was incorrectly implemented, and blockmaxsize was silently
ignored.
No users have complained about blockmaxsize being ignored, so just
remove it in V0.17.
Fixes #12640
cc @ajtowns
Tree-SHA512: 968d71d37bf175c5a02539ddec289a12586f886e1dfe64c1d9aa5e39db48d06d21665153824fac3b11503a55f0812d2f1115a2d726aafd37b76ed629ec0aa671
Diffstat (limited to 'test/functional/feature_fee_estimation.py')
| -rwxr-xr-x | test/functional/feature_fee_estimation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py index f434b6682b..8e97df2361 100755 --- a/test/functional/feature_fee_estimation.py +++ b/test/functional/feature_fee_estimation.py @@ -133,8 +133,8 @@ class EstimateFeeTest(BitcoinTestFramework): which we will use to generate our transactions. """ self.add_nodes(3, extra_args=[["-maxorphantx=1000", "-whitelist=127.0.0.1"], - ["-blockmaxsize=17000", "-maxorphantx=1000"], - ["-blockmaxsize=8000", "-maxorphantx=1000"]]) + ["-maxorphantx=1000"], + ["-maxorphantx=1000"]]) # 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 size at 1,000 bytes, |