aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authormb300sd <mb300sd@git>2015-12-14 14:21:34 -0500
committermb300sd <mb300sd@git>2015-12-15 02:01:45 -0500
commit37d271d7cce44885f835292ffe99b54399b014d6 (patch)
tree4d9a7d48884c4bbeeb0cb3e91c3b8ae79b5a4fe8 /src/script
parent7a5040155ed59f8c9c51734bb2ee29f1593eaa6a (diff)
downloadbitcoin-37d271d7cce44885f835292ffe99b54399b014d6.tar.xz
Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.
Diffstat (limited to 'src/script')
-rw-r--r--src/script/script.cpp2
-rw-r--r--src/script/script.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 9c77ed9fc1..a7ba57e65b 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -131,7 +131,7 @@ const char* GetOpName(opcodetype opcode)
// expanson
case OP_NOP1 : return "OP_NOP1";
- case OP_NOP2 : return "OP_NOP2";
+ case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY";
case OP_NOP3 : return "OP_NOP3";
case OP_NOP4 : return "OP_NOP4";
case OP_NOP5 : return "OP_NOP5";
diff --git a/src/script/script.h b/src/script/script.h
index 3650957fc9..7a37b66ccf 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -162,8 +162,8 @@ enum opcodetype
// expansion
OP_NOP1 = 0xb0,
- OP_NOP2 = 0xb1,
- OP_CHECKLOCKTIMEVERIFY = OP_NOP2,
+ OP_CHECKLOCKTIMEVERIFY = 0xb1,
+ OP_NOP2 = OP_CHECKLOCKTIMEVERIFY,
OP_NOP3 = 0xb2,
OP_NOP4 = 0xb3,
OP_NOP5 = 0xb4,