aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/decodescript.py
diff options
context:
space:
mode:
authormb300sd <mb300sd@git>2015-12-14 14:21:34 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2016-01-13 21:25:36 +0000
commit605de4a88a7a9c17abf2c8c66bf6fed32fcdedbd (patch)
tree56bca4f0bb98c9ec3fd92d0a8492334f4ba09294 /qa/rpc-tests/decodescript.py
parent6191a9b62831a27e40ee2fbb6429383879539700 (diff)
downloadbitcoin-605de4a88a7a9c17abf2c8c66bf6fed32fcdedbd.tar.xz
Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.
Github-Pull: #7213 Rebased-From: 37d271d7cce44885f835292ffe99b54399b014d6
Diffstat (limited to 'qa/rpc-tests/decodescript.py')
-rwxr-xr-xqa/rpc-tests/decodescript.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/decodescript.py b/qa/rpc-tests/decodescript.py
index 4bca623380..490808d49d 100755
--- a/qa/rpc-tests/decodescript.py
+++ b/qa/rpc-tests/decodescript.py
@@ -102,13 +102,13 @@ class DecodeScriptTest(BitcoinTestFramework):
# OP_IF
# <receiver-pubkey> OP_CHECKSIGVERIFY
# OP_ELSE
- # <lock-until> OP_NOP2 OP_DROP
+ # <lock-until> OP_CHECKLOCKTIMEVERIFY OP_DROP
# OP_ENDIF
# <sender-pubkey> OP_CHECKSIG
#
# lock until block 500,000
rpc_result = self.nodes[0].decodescript('63' + push_public_key + 'ad670320a107b17568' + push_public_key + 'ac')
- assert_equal('OP_IF ' + public_key + ' OP_CHECKSIGVERIFY OP_ELSE 500000 OP_NOP2 OP_DROP OP_ENDIF ' + public_key + ' OP_CHECKSIG', rpc_result['asm'])
+ assert_equal('OP_IF ' + public_key + ' OP_CHECKSIGVERIFY OP_ELSE 500000 OP_CHECKLOCKTIMEVERIFY OP_DROP OP_ENDIF ' + public_key + ' OP_CHECKSIG', rpc_result['asm'])
def decoderawtransaction_asm_sighashtype(self):
"""Tests decoding scripts via RPC command "decoderawtransaction".