Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.

Commit cc69983

Browse files
authored
Merge pull request #632 from HowJMay/non_tryte
refactor(serialization): Separate serializer into components
2 parents 882a451 + e2bf870 commit cc69983

File tree

17 files changed

+1227
-933
lines changed

17 files changed

+1227
-933
lines changed

accelerator/core/apis.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ status_t api_send_mam_message(const ta_config_t* const info, const iota_config_t
311311
ta_send_mam_req_t* req = send_mam_req_new();
312312
ta_send_mam_res_t* res = send_mam_res_new();
313313

314-
if (send_mam_req_deserialize(obj, req)) {
314+
if (send_mam_message_req_deserialize(obj, req)) {
315315
ret = SC_MAM_FAILED_INIT;
316316
ta_log_error("%s\n", ta_error_to_string(ret));
317317
goto done;
@@ -323,7 +323,7 @@ status_t api_send_mam_message(const ta_config_t* const info, const iota_config_t
323323
goto done;
324324
}
325325

326-
ret = send_mam_res_serialize(res, json_result);
326+
ret = send_mam_message_res_serialize(res, json_result);
327327
if (ret != SC_OK) {
328328
ta_log_error("%s\n", ta_error_to_string(ret));
329329
}

accelerator/core/serializer/BUILD

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,41 @@ cc_library(
44
hdrs = ["serializer.h"],
55
visibility = ["//visibility:public"],
66
deps = [
7+
":ser_helper",
8+
":ser_mam",
79
"//accelerator:ta_config",
810
"//common",
911
"//accelerator:build_option",
1012
"//accelerator/core/request",
1113
"//accelerator/core/response",
1214
"//utils:fill_nines",
13-
"@cJSON",
14-
"@entangled//cclient/response:responses",
15-
"@entangled//common/trinary:flex_trit",
16-
"@entangled//utils:char_buffer",
17-
"@entangled//utils/containers/hash:hash_array",
1815
] + select({
1916
"//accelerator:mqtt_enable": ["//connectivity/mqtt:mqtt_common"],
2017
"//conditions:default": [],
2118
}),
2219
)
20+
21+
cc_library(
22+
name = "ser_helper",
23+
srcs = ["ser_helper.c"],
24+
hdrs = ["ser_helper.h"],
25+
deps = [
26+
"//accelerator/core/request",
27+
"//accelerator/core/response",
28+
"//common",
29+
"@cJSON",
30+
],
31+
)
32+
33+
cc_library(
34+
name = "ser_mam",
35+
srcs = ["ser_mam.c"],
36+
hdrs = ["ser_mam.h"],
37+
deps = [
38+
":ser_helper",
39+
"//accelerator/core/request",
40+
"//accelerator/core/response",
41+
"//common",
42+
"@cJSON",
43+
],
44+
)

0 commit comments

Comments
 (0)