diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-18 10:36:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-18 10:36:57 +0100 |
| commit | 1709cc5cb0e5ba8f07b368e145f5eebcda118f50 (patch) | |
| tree | 4cd3955d915efc271d172d60e62beef31f519b4a /qa/rpc-tests/bip65-cltv-p2p.py | |
| parent | b0cb0556737b8022c0536272f2a5b4cb165ac676 (diff) | |
| parent | f17b00b66fb88d7d0324a40460fb23aaff818f68 (diff) | |
| download | bitcoin-1709cc5cb0e5ba8f07b368e145f5eebcda118f50.tar.xz | |
Merge pull request #7338
f17b00b release-notes: Combine NOP2->CLTV asm change into "RPC: Low-level API changes" section (Luke Dashjr)
e20704b Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)
6f8346d qt5: Use the fixed font the system recommends (MarcoFalke)
605de4a Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
6191a9b [RPC-Tests] add option to run rpc test over QT clients (Jonas Schnelli)
6307beb Note that reviewers should mention the commit hash of the commits they reviewed. (Patrick Strateman)
6092ff2 Set link from http:// to https:// (Suriyaa Kudo)
Diffstat (limited to 'qa/rpc-tests/bip65-cltv-p2p.py')
| -rwxr-xr-x | qa/rpc-tests/bip65-cltv-p2p.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py index 9ca5c69f16..5bb41df1ad 100755 --- a/qa/rpc-tests/bip65-cltv-p2p.py +++ b/qa/rpc-tests/bip65-cltv-p2p.py @@ -9,7 +9,7 @@ from test_framework.util import * from test_framework.mininode import CTransaction, NetworkThread from test_framework.blocktools import create_coinbase, create_block from test_framework.comptool import TestInstance, TestManager -from test_framework.script import CScript, OP_1NEGATE, OP_NOP2, OP_DROP +from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP from binascii import hexlify, unhexlify import cStringIO import time @@ -19,7 +19,7 @@ def cltv_invalidate(tx): Prepends -1 CLTV DROP in the scriptSig itself. ''' - tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_NOP2, OP_DROP] + + tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP] + list(CScript(tx.vin[0].scriptSig))) ''' |