aboutsummaryrefslogtreecommitdiff
path: root/qa/pull-tester
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-03-30 17:50:38 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-03-30 18:59:39 +0200
commite8a8f3d4b22b76a14693f4c2af645021f656c823 (patch)
tree40aa207b03af739b035705ca4824e5768e78980f /qa/pull-tester
parent60db51dcb2005506e91d13a37eaaca5cd82a76d7 (diff)
parent71527a0f31ae67edad0a7fcda59c75a6ce5666ca (diff)
downloadbitcoin-e8a8f3d4b22b76a14693f4c2af645021f656c823.tar.xz
Merge #7648: BIP9 versionbits softfork for BIP68, BIP112 and BIP113
71527a0 Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier) 19d73d5 Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos) 12c89c9 Policy: allow transaction version 2 relay policy. (BtcDrak) 02c2435 Soft fork logic for BIP68 (BtcDrak) 478fba6 Soft fork logic for BIP113 (BtcDrak) 65751a3 Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille)
Diffstat (limited to 'qa/pull-tester')
-rwxr-xr-xqa/pull-tester/rpc-tests.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index d5d5f10610..d794dbe806 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -83,6 +83,7 @@ if EXEEXT == ".exe" and "-win" not in opts:
#Tests
testScripts = [
+ 'bip68-112-113-p2p.py',
'wallet.py',
'listtransactions.py',
'receivedby.py',
@@ -119,6 +120,7 @@ testScripts = [
'importprunedfunds.py',
]
testScriptsExt = [
+ 'bip9-softforks.py',
'bip65-cltv.py',
'bip65-cltv-p2p.py',
'bip68-sequence.py',