aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/bip68-112-113-p2p.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-02-23 16:39:14 +0100
committerMarcoFalke <falke.marco@gmail.com>2017-02-23 16:39:22 +0100
commitd6064a89ac97dc0d2ce9da3982e1a4e25afaeda8 (patch)
tree824034a5baf053cfc624a4cf74bd21e1d73c8056 /qa/rpc-tests/bip68-112-113-p2p.py
parent7146d96de3e15a80cafbab2af48ff6f65d8e41bb (diff)
parent3f95a806b1cd2f3c944bda7bcc266498a59326e4 (diff)
Merge #9577: Fix docstrings in qa tests
3f95a80 Fix docstrings in qa tests (John Newbery)
Diffstat (limited to 'qa/rpc-tests/bip68-112-113-p2p.py')
-rwxr-xr-xqa/rpc-tests/bip68-112-113-p2p.py23
1 files changed, 11 insertions, 12 deletions
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index e03bc1c37b..836267ea7f 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -2,18 +2,8 @@
# Copyright (c) 2015-2016 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test activation of the first version bits soft fork.
-from test_framework.test_framework import ComparisonTestFramework
-from test_framework.util import *
-from test_framework.mininode import ToHex, NetworkThread
-from test_framework.blocktools import create_coinbase, create_block
-from test_framework.comptool import TestInstance, TestManager
-from test_framework.script import *
-from io import BytesIO
-import time
-
-'''
-This test is meant to exercise activation of the first version bits soft fork
This soft fork will activate the following BIPS:
BIP 68 - nSequence relative lock times
BIP 112 - CHECKSEQUENCEVERIFY
@@ -51,7 +41,16 @@ bip112txs_vary_nSequence_9 - 16 txs with nSequence relative_locktimes of 9 evalu
bip112txs_vary_OP_CSV - 16 txs with nSequence = 10 evaluated against varying {relative_locktimes of 10} OP_CSV OP_DROP
bip112txs_vary_OP_CSV_9 - 16 txs with nSequence = 9 evaluated against varying {relative_locktimes of 10} OP_CSV OP_DROP
bip112tx_special - test negative argument to OP_CSV
-'''
+"""
+
+from test_framework.test_framework import ComparisonTestFramework
+from test_framework.util import *
+from test_framework.mininode import ToHex, CTransaction, NetworkThread
+from test_framework.blocktools import create_coinbase, create_block
+from test_framework.comptool import TestInstance, TestManager
+from test_framework.script import *
+from io import BytesIO
+import time
base_relative_locktime = 10
seq_disable_flag = 1<<31