Merge pull request #130 from wusyong/receive_mam_serialize

feat(serializer): Add receive_mam_message serialize

Author: jserv

accelerator/apis.c

@@ -160,6 +160,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
   status_t ret = SC_OK;
   tryte_t* payload_trytes = NULL;
   tryte_t* none_chid_trytes = NULL;
+  char* payload = NULL;
   size_t payload_size = 0;
   bundle_transactions_t* bundle = NULL;
   bundle_transactions_new(&bundle);
@@ -191,15 +192,20 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
       ret = SC_MAM_NO_PAYLOAD;
       goto done;
     } else {
-      *(json_result) = calloc(payload_size * 2 + 1, sizeof(char));
-      trytes_to_ascii(payload_trytes, payload_size, *(json_result));
+      payload = calloc(payload_size * 2 + 1, sizeof(char));
+      if (payload == NULL) {
+        ret = SC_TA_NULL;
+        goto done;
+      }
+      trytes_to_ascii(payload_trytes, payload_size, payload);
     }
   } else {
     ret = SC_MAM_NOT_FOUND;
     goto done;
   }
 
-  // Cleanup
+  ret = receive_mam_message_serialize(json_result, &payload);
+
 done:
   // Destroying MAM API
   if (ret != SC_MAM_FAILED_INIT) {
@@ -209,6 +215,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
   }
   free(none_chid_trytes);
   free(payload_trytes);
+  free(payload);
   bundle_transactions_free(&bundle);
 
   return ret;

serializer/serializer.c

@@ -386,3 +386,24 @@ status_t ta_find_transactions_obj_res_serialize(
   cJSON_Delete(json_root);
   return ret;
 }
+
+status_t receive_mam_message_serialize(char** obj, const char** res) {
+  status_t ret = SC_OK;
+  cJSON* json_root = cJSON_CreateObject();
+  if (json_root == NULL) {
+    ret = SC_SERIALIZER_JSON_CREATE;
+    goto done;
+  }
+
+  cJSON_AddStringToObject(json_root, "message", *res);
+
+  *obj = cJSON_PrintUnformatted(json_root);
+  if (*obj == NULL) {
+    ret = SC_SERIALIZER_JSON_PARSE;
+    goto done;
+  }
+
+done:
+  cJSON_Delete(json_root);
+  return ret;
+}

serializer/serializer.h

@@ -111,6 +111,17 @@ status_t ta_find_transactions_res_serialize(
 status_t ta_find_transactions_obj_res_serialize(
     char** obj, const ta_find_transactions_obj_res_t* const res);
 
+/**
+ * @brief Serialize mam message
+ *
+ * @param[out] obj message formed in JSON
+ * @param[in] res Response of payload message
+ *
+ * @return
+ * - SC_OK on success
+ * - non-zero on error
+ */
+status_t receive_mam_message_serialize(char** obj, const char** res);
 #ifdef __cplusplus
 }
 #endif