aboutsummaryrefslogtreecommitdiff
path: root/src/script
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 /src/script
parent6191a9b62831a27e40ee2fbb6429383879539700 (diff)
Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.
Github-Pull: #7213 Rebased-From: 37d271d7cce44885f835292ffe99b54399b014d6
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 fa1307d618..9f2809e593 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 2b95a4af81..6551eea30d 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,