Merge df8e572 into merged_master (Elements PR ElementsProject#1286)

jamesdorfman · May 24, 2024 · dbbde2d · dbbde2d
2 parents 77b849f + df8e572
commit dbbde2d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/script/script_error.h b/src/script/script_error.h
@@ -82,8 +82,6 @@ typedef enum ScriptError_t
     SCRIPT_ERR_OP_CODESEPARATOR,
     SCRIPT_ERR_SIG_FINDANDDELETE,
 
-    SCRIPT_ERR_ERROR_COUNT,
-
     // ELEMENTS:
     SCRIPT_ERR_RANGEPROOF,
     SCRIPT_ERR_PEDERSEN_TALLY,
@@ -96,10 +94,13 @@ typedef enum ScriptError_t
     SCRIPT_ERR_INTROSPECT_INDEX_OUT_OF_BOUNDS,
     SCRIPT_ERR_EXPECTED_8BYTES,
     SCRIPT_ERR_ARITHMETIC64,
-    SCRIPT_ERR_ECMULTVERIFYFAIL
+    SCRIPT_ERR_ECMULTVERIFYFAIL,
+
+    /* Must go last */
+    SCRIPT_ERR_ERROR_COUNT
 } ScriptError;
 
-#define SCRIPT_ERR_LAST SCRIPT_ERR_ECMULTVERIFYFAIL
+#define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT
 
 std::string ScriptErrorString(const ScriptError error);