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

Commit 15e5e43

Browse files
committed
feat: Synchronize with entangled for MAM APIs
In order to implement api_receive_mam_message(), some functions implemented in the later commits are necessary.
1 parent dd0d6be commit 15e5e43

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
22

33
git_repository(
44
name = "rules_iota",
5-
commit = "b15744b9ea520717752c866d5afc769c3b6b68f3",
5+
commit = "1cb59eea62fd1d071de213a9aa46e61e8273472d",
66
remote = "https://github.com/iotaledger/rules_iota.git",
77
)
88

99
git_repository(
1010
name = "entangled",
11-
commit = "8d847ffcecd50f8f3760bfee07d7ed33ecc067bf",
11+
commit = "4960865730640d23e75ffbce84d3f74264cfcd28",
1212
remote = "https://github.com/iotaledger/entangled.git",
1313
)
1414

accelerator/common_core.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ status_t ta_send_trytes(const iota_config_t* const tangle,
198198

199199
done:
200200
ta_get_tips_res_free(&get_txn_res);
201-
attach_req->trytes = NULL;
202201
attach_to_tangle_req_free(&attach_req);
203202
attach_to_tangle_res_free(&attach_res);
204203
return ret;
@@ -467,7 +466,7 @@ static int idx_sort(void const* lhs, void const* rhs) {
467466
}
468467

469468
static void get_first_bundle_from_transactions(
470-
transaction_array_t const transactions,
469+
transaction_array_t const* transactions,
471470
bundle_transactions_t* const bundle) {
472471
iota_transaction_t* tail = NULL;
473472
iota_transaction_t* curr_tx = NULL;
@@ -493,9 +492,8 @@ status_t ta_get_bundle(const iota_client_service_t* const service,
493492
tryte_t const* const bundle_hash,
494493
bundle_transactions_t* const bundle) {
495494
status_t ret = SC_OK;
496-
iota_transaction_t* curr_tx = NULL;
497495
flex_trit_t bundle_hash_flex[FLEX_TRIT_SIZE_243];
498-
transaction_array_t tx_objs = transaction_array_new();
496+
transaction_array_t* tx_objs = transaction_array_new();
499497
find_transactions_req_t* find_tx_req = find_transactions_req_new();
500498
if (find_tx_req == NULL) {
501499
ret = SC_CCLIENT_OOM;

response/ta_get_transaction_object.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ ta_get_transaction_object_res_t* ta_get_transaction_object_res_new() {
1111
}
1212

1313
void ta_get_transaction_object_res_free(ta_get_transaction_object_res_t** res) {
14-
if (!res || !(*res) || !(*res)->txn) {
14+
if (!res || !(*res)) {
1515
return;
1616
}
1717

18-
transaction_free((*res)->txn);
18+
if ((*res)->txn) {
19+
transaction_free((*res)->txn);
20+
}
1921
free(*res);
2022
*res = NULL;
2123
}

tests/iota_api_mock.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ retcode_t iota_client_find_transactions(
4141

4242
retcode_t iota_client_find_transaction_objects(
4343
const iota_client_service_t* const service,
44-
const find_transactions_req_t* const req, transaction_array_t tx_objs) {
44+
const find_transactions_req_t* const req, transaction_array_t* tx_objs) {
4545
flex_trit_t tx_trits[FLEX_TRIT_SIZE_8019];
4646
iota_transaction_t tx;
4747

tests/iota_api_mock.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class IotaAPI {
2929
}
3030
virtual retcode_t iota_client_find_transaction_objects(
3131
const iota_client_service_t* const service,
32-
const find_transactions_req_t* const req, transaction_array_t tx_objs) {
32+
const find_transactions_req_t* const req, transaction_array_t* tx_objs) {
3333
return RC_OK;
3434
}
3535
virtual retcode_t iota_client_get_new_address(
@@ -71,7 +71,7 @@ class APIMock : public IotaAPI {
7171
MOCK_METHOD3(iota_client_find_transaction_objects,
7272
retcode_t(const iota_client_service_t* const service,
7373
const find_transactions_req_t* const req,
74-
transaction_array_t tx_objs));
74+
transaction_array_t* tx_objs));
7575
MOCK_METHOD4(iota_client_get_new_address,
7676
retcode_t(iota_client_service_t const* const serv,
7777
flex_trit_t const* const seed,

0 commit comments

Comments
 (0)