Review fixes

Author: xxuejie

contracts/c-sphincs-all-in-one-lock/ckb-sphincsplus-root-lock.c

@@ -115,8 +115,7 @@ static int write_to_blake2b(const uint8_t *data, size_t length, void *context) {
 int fetch_params(uint8_t id, const CkbSphincsParams **params) {
   int err = CKB_SUCCESS;
   uint8_t index = MULTISIG_PARAM_ID_TO_INDEX(id);
-  CHECK2(index >= 0 && index < CKB_SPHINCS_SUPPORTED_PARAMS_COUNT,
-         ERROR_SPHINCSPLUS_WITNESS);
+  CHECK2(index < CKB_SPHINCS_SUPPORTED_PARAMS_COUNT, ERROR_SPHINCSPLUS_WITNESS);
   *params = &ckb_sphincs_supported_params[index];
 
 exit:

contracts/c-sphincs-all-in-one-lock/ckb-sphincsplus.c

@@ -25,6 +25,7 @@ enum SphincsPlusError {
   SphincsPlusError_Params = 200,
   SphincsPlusError_Verify,
   SphincsPlusError_OutputSignLength,
+  SphincsPlusError_SignSignature,
 };
 
 #ifndef CKB_VM
@@ -47,12 +48,12 @@ int sphincs_plus_sign(const uint8_t *message, uint32_t message_size,
   int ret =
       crypto_sign_signature(out_sign, &out_sign_len, message, message_size, sk);
   if (ret != 0) {
-    return ret;
+    return SphincsPlusError_SignSignature;
   }
   if ((uint32_t)out_sign_len != SPHINCS_PLUS_SIGN_SIZE) {
     return SphincsPlusError_OutputSignLength;
   }
-  return ret;
+  return 0;
 }
 
 /* Defined for Rust FFI usage, script code would only require the macros */

contracts/c-sphincs-all-in-one-lock/nist-vector-tester.c

@@ -41,8 +41,7 @@
 int fetch_params(uint8_t id, const CkbSphincsParams **params) {
   int err = CKB_SUCCESS;
   uint8_t index = MULTISIG_PARAM_ID_TO_INDEX(id);
-  CHECK2(index >= 0 && index < CKB_SPHINCS_SUPPORTED_PARAMS_COUNT,
-         ERROR_SPHINCSPLUS_WITNESS);
+  CHECK2(index < CKB_SPHINCS_SUPPORTED_PARAMS_COUNT, ERROR_SPHINCSPLUS_WITNESS);
   *params = &ckb_sphincs_supported_params[index];
 
 exit:

contracts/c-sphincs-all-in-one-lock/utils/zero_escape_encoding.h

@@ -1,6 +1,10 @@
 #ifndef CKB_ZERO_ESCAPE_ENCODING_H_
 #define CKB_ZERO_ESCAPE_ENCODING_H_
 
+#ifndef CKB_ZERO_ESCAPE_ERROR_CODE
+#define CKB_ZERO_ESCAPE_ERROR_CODE 90
+#endif
+
 /*
  * A simple escape encoder that:
  *
@@ -26,19 +30,19 @@ int zero_escape_encode(const uint8_t *src, size_t src_length, uint8_t *dst,
   for (size_t i = 0; i < src_length; i++) {
     if (src[i] == '\0' || src[i] == (uint8_t)'\xFE') {
       if (wrote + 2 > limit) {
-        return 90;
+        return CKB_ZERO_ESCAPE_ERROR_CODE;
       }
       dst[wrote++] = '\xFE';
       dst[wrote++] = src[i] - 1;
     } else {
       if (wrote + 1 > limit) {
-        return 90;
+        return CKB_ZERO_ESCAPE_ERROR_CODE;
       }
       dst[wrote++] = src[i];
     }
   }
   if (wrote + 1 > limit) {
-    return 90;
+    return CKB_ZERO_ESCAPE_ERROR_CODE;
   }
   dst[wrote++] = '\0';
 
@@ -53,7 +57,7 @@ int zero_escape_decode_in_place(uint8_t *buffer, size_t *length) {
   for (size_t i = 0; i < limit;) {
     if (buffer[i] == (uint8_t)'\xFE') {
       if (i + 1 >= limit) {
-        return 90;
+        return CKB_ZERO_ESCAPE_ERROR_CODE;
       }
       buffer[wrote++] = buffer[i + 1] + 1;