aboutsummaryrefslogtreecommitdiff
path: root/test/functional/p2p_segwit.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-08-27 12:54:24 +0200
committerMarcoFalke <falke.marco@gmail.com>2021-09-16 18:52:59 +0200
commitfaad1e5ffda255aecf1b0ea2152cd4f6805e678f (patch)
treef5f115168b1c19db862c66d23ca82a41a6a99f5e /test/functional/p2p_segwit.py
parentfadb2ef2fa8561882db463f35df9b8a0e9609658 (diff)
downloadbitcoin-faad1e5ffda255aecf1b0ea2152cd4f6805e678f.tar.xz
Introduce -testactivationheight=name@height setting
Diffstat (limited to 'test/functional/p2p_segwit.py')
-rwxr-xr-xtest/functional/p2p_segwit.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
index 1b316268d7..3c33b89535 100755
--- a/test/functional/p2p_segwit.py
+++ b/test/functional/p2p_segwit.py
@@ -192,8 +192,8 @@ class SegWitTest(BitcoinTestFramework):
self.num_nodes = 2
# This test tests SegWit both pre and post-activation, so use the normal BIP9 activation.
self.extra_args = [
- ["-acceptnonstdtxn=1", "-segwitheight={}".format(SEGWIT_HEIGHT), "-whitelist=noban@127.0.0.1"],
- ["-acceptnonstdtxn=0", "-segwitheight={}".format(SEGWIT_HEIGHT)],
+ ["-acceptnonstdtxn=1", f"-testactivationheight=segwit@{SEGWIT_HEIGHT}", "-whitelist=noban@127.0.0.1"],
+ ["-acceptnonstdtxn=0", f"-testactivationheight=segwit@{SEGWIT_HEIGHT}"],
]
self.supports_cli = False