aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-03-31 11:07:49 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-03-31 11:08:13 +0200
commit7c80e720402dcb7c26be7da2aaa5a39a34feddaf (patch)
tree5dddaab41138e64531c047798564668f934e85c0
parent16555b658f5b98fd5e0102bd3618659588fe8d0b (diff)
parent40234ba89f00afe96daf807acf61e6a23f8a81fa (diff)
downloadbitcoin-7c80e720402dcb7c26be7da2aaa5a39a34feddaf.tar.xz
Merge #7773: Fix comments in tests
40234ba Fix comments in tests (BtcDrak)
-rwxr-xr-xqa/rpc-tests/bip68-112-113-p2p.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py
index c226f4dad4..7d3c59be3e 100755
--- a/qa/rpc-tests/bip68-112-113-p2p.py
+++ b/qa/rpc-tests/bip68-112-113-p2p.py
@@ -383,9 +383,9 @@ class BIP68_112_113Test(ComparisonTestFramework):
for bip113tx in [bip113signed1, bip113signed2]:
yield TestInstance([[self.create_test_block([bip113tx]), False]]) # 9,10
# BIP 113 tests should now pass if the locktime is < MTP
- bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 - 1 # = MTP of prior block (not <) but < time put on current block
+ bip113tx_v1.nLockTime = self.last_block_time - 600 * 5 - 1 # < MTP of prior block
bip113signed1 = self.sign_transaction(self.nodes[0], bip113tx_v1)
- bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 - 1 # = MTP of prior block (not <) but < time put on current block
+ bip113tx_v2.nLockTime = self.last_block_time - 600 * 5 - 1 # < MTP of prior block
bip113signed2 = self.sign_transaction(self.nodes[0], bip113tx_v2)
for bip113tx in [bip113signed1, bip113signed2]:
yield TestInstance([[self.create_test_block([bip113tx]), True]]) # 11,12
@@ -490,7 +490,7 @@ class BIP68_112_113Test(ComparisonTestFramework):
self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
## SEQUENCE_LOCKTIME_DISABLE_FLAG is unset in argument to OP_CSV for all remaining txs ##
- # All txs with nSequence 11 should fail either due to earlier mismatch or failing the CSV check
+ # All txs with nSequence 9 should fail either due to earlier mismatch or failing the CSV check
fail_txs = []
fail_txs.extend(all_rlt_txs(bip112txs_vary_nSequence_9_v2)) # 16/16 of vary_nSequence_9
for b25 in xrange(2):