Skip to content

Commit df8e572

Browse files
committed
Merge #1286: Script: Move SCRIPT_ERR_COUNT
f424312 Script: Move SCRIPT_ERR_COUNT (Christian Lewe) Pull request description: Fix #1285 ACKs for top commit: delta1: ACK f424312 Tree-SHA512: b52a09c8da11bbfd11e82b0b7e18480eaa7f1948637c21385ad0307050b06e890244fef56e2f0747d5bb31bd6e3339b9f110f6872dff733493cb767c0fa09aa9
2 parents 20c5630 + f424312 commit df8e572

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/script/script_error.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ typedef enum ScriptError_t
8282
SCRIPT_ERR_OP_CODESEPARATOR,
8383
SCRIPT_ERR_SIG_FINDANDDELETE,
8484

85-
SCRIPT_ERR_ERROR_COUNT,
86-
8785
// ELEMENTS:
8886
SCRIPT_ERR_RANGEPROOF,
8987
SCRIPT_ERR_PEDERSEN_TALLY,
@@ -96,10 +94,13 @@ typedef enum ScriptError_t
9694
SCRIPT_ERR_INTROSPECT_INDEX_OUT_OF_BOUNDS,
9795
SCRIPT_ERR_EXPECTED_8BYTES,
9896
SCRIPT_ERR_ARITHMETIC64,
99-
SCRIPT_ERR_ECMULTVERIFYFAIL
97+
SCRIPT_ERR_ECMULTVERIFYFAIL,
98+
99+
/* Must go last */
100+
SCRIPT_ERR_ERROR_COUNT
100101
} ScriptError;
101102

102-
#define SCRIPT_ERR_LAST SCRIPT_ERR_ECMULTVERIFYFAIL
103+
#define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT
103104

104105
std::string ScriptErrorString(const ScriptError error);
105106

0 commit comments

Comments
 (0)