aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-06-04 19:26:26 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-06-04 19:27:03 +0200
commitd24310d23aa323dea1c80be52395d6194ac18232 (patch)
tree1023ff1d8e35ad9b4d3529a438b860e1476ab51b /src
parent358a61ee061f5cec53c62e8226872a2d02afdb0d (diff)
parentaab2c0fd7e7f629b20192ab9f05b281e5783cacc (diff)
Merge pull request #4260
aab2c0f Remove template matching params from GetOpName() (Huang Le)
Diffstat (limited to 'src')
-rw-r--r--src/script.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/script.cpp b/src/script.cpp
index ac6d4b316f..381e84d0b7 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -208,14 +208,13 @@ const char* GetOpName(opcodetype opcode)
case OP_NOP9 : return "OP_NOP9";
case OP_NOP10 : return "OP_NOP10";
+ case OP_INVALIDOPCODE : return "OP_INVALIDOPCODE";
+ // Note:
+ // The template matching params OP_SMALLDATA/etc are defined in opcodetype enum
+ // as kind of implementation hack, they are *NOT* real opcodes. If found in real
+ // Script, just let the default: case deal with them.
- // template matching params
- case OP_PUBKEYHASH : return "OP_PUBKEYHASH";
- case OP_PUBKEY : return "OP_PUBKEY";
- case OP_SMALLDATA : return "OP_SMALLDATA";
-
- case OP_INVALIDOPCODE : return "OP_INVALIDOPCODE";
default:
return "OP_UNKNOWN";
}