diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-10-16 11:35:53 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-10-16 11:43:21 +0200 |
| commit | cb21d864c52b7858000ff6c8727240f1721132a9 (patch) | |
| tree | e69e0f67bb3faba1674abe1c5fbfad8757722abe /test/functional/feature_segwit.py | |
| parent | 2947ae6f85d40baa8ac0d2180b181c60708ad0ba (diff) | |
| parent | d438d609cd64fe532d94e45000495de93ef99aa6 (diff) | |
| download | bitcoin-cb21d864c52b7858000ff6c8727240f1721132a9.tar.xz | |
Merge #19401: QA: Use GBT to get block versions correct
d438d609cd64fe532d94e45000495de93ef99aa6 QA: Use GBT to get block versions correct (Luke Dashjr)
1df2cd1c8f468bd7a5b1335a46ccea28fbddaacb QA: blocktools: Accept block template to create_block (Luke Dashjr)
Pull request description:
The goal here is to decouple unrelated tests from the details of block versions.
Currently, these tests are forcing specific versions of blocks for no real reason.
ACKs for top commit:
fjahr:
re-ACK d438d609cd64fe532d94e45000495de93ef99aa6
benthecarman:
ACK d438d60
Tree-SHA512: 523b1cd4dac8d65c88432e126ce7f60df96ca4b94f7ecc8e83ba4ffbade23e2afe7055fdf586ce3c195a533f2004e63fff83add4267b39473a581c9f1c6d5340
Diffstat (limited to 'test/functional/feature_segwit.py')
| -rwxr-xr-x | test/functional/feature_segwit.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/functional/feature_segwit.py b/test/functional/feature_segwit.py index 0842972779..120e4c2001 100755 --- a/test/functional/feature_segwit.py +++ b/test/functional/feature_segwit.py @@ -61,14 +61,12 @@ class SegWitTest(BitcoinTestFramework): ], [ "-acceptnonstdtxn=1", - "-blockversion=4", "-rpcserialversion=1", "-segwitheight=432", "-addresstype=legacy", ], [ "-acceptnonstdtxn=1", - "-blockversion=536870915", "-segwitheight=432", "-addresstype=legacy", ], |