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

Commit 7d431e5

Browse files
author
Yu Wei Wu
committed
fix(config): Rename iota_config_t variable
1 parent 1a91bf7 commit 7d431e5

File tree

9 files changed

+41
-39
lines changed

9 files changed

+41
-39
lines changed

‎accelerator/apis.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ status_t api_get_tips(const iota_client_service_t* const service,
4444
return ret;
4545
}
4646

47-
status_t api_get_tips_pair(const iota_config_t* const config,
47+
status_t api_get_tips_pair(const iota_config_t* const tangle,
4848
const iota_client_service_t* const service,
4949
char** json_result) {
5050
status_t ret = SC_OK;
@@ -54,7 +54,7 @@ status_t api_get_tips_pair(const iota_config_t* const config,
5454
goto done;
5555
}
5656

57-
ret = cclient_get_txn_to_approve(service, config->depth, res);
57+
ret = cclient_get_txn_to_approve(service, tangle->depth, res);
5858
if (ret) {
5959
goto done;
6060
}
@@ -66,7 +66,7 @@ status_t api_get_tips_pair(const iota_config_t* const config,
6666
return ret;
6767
}
6868

69-
status_t api_generate_address(const iota_config_t* const config,
69+
status_t api_generate_address(const iota_config_t* const tangle,
7070
const iota_client_service_t* const service,
7171
char** json_result) {
7272
status_t ret = SC_OK;
@@ -76,7 +76,7 @@ status_t api_generate_address(const iota_config_t* const config,
7676
goto done;
7777
}
7878

79-
ret = ta_generate_address(config, service, res);
79+
ret = ta_generate_address(tangle, service, res);
8080
if (ret) {
8181
goto done;
8282
}
@@ -205,7 +205,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
205205
return ret;
206206
}
207207

208-
status_t api_send_transfer(const iota_config_t* const config,
208+
status_t api_send_transfer(const iota_config_t* const tangle,
209209
const iota_client_service_t* const service,
210210
const char* const obj, char** json_result) {
211211
status_t ret = SC_OK;
@@ -225,7 +225,7 @@ status_t api_send_transfer(const iota_config_t* const config,
225225
goto done;
226226
}
227227

228-
ret = ta_send_transfer(config, service, req, res);
228+
ret = ta_send_transfer(tangle, service, req, res);
229229
if (ret) {
230230
goto done;
231231
}

‎accelerator/apis.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ extern "C" {
2828
* Generate and return an unused address from the seed. An unused address means
2929
* the address does not have any transaction with it yet.
3030
*
31-
* @param[in] config IOTA API parameter configurations
31+
* @param[in] tangle IOTA API parameter configurations
3232
* @param[in] service IRI node end point service
3333
* @param[out] json_result Result containing an unused address in json format
3434
*
3535
* @return
3636
* - SC_OK on success
3737
* - non-zero on error
3838
*/
39-
status_t api_generate_address(const iota_config_t* const config,
39+
status_t api_generate_address(const iota_config_t* const tangle,
4040
const iota_client_service_t* const service,
4141
char** json_result);
4242

@@ -46,15 +46,15 @@ status_t api_generate_address(const iota_config_t* const config,
4646
* Get a tips pair as trunk/branch transactions for transaction construction.
4747
* The result is char array in json format:
4848
*
49-
* @param[in] config IOTA API parameter configurations
49+
* @param[in] tangle IOTA API parameter configurations
5050
* @param[in] service IRI node end point service
5151
* @param[out] json_result Result containing a tips pair in json format
5252
*
5353
* @return
5454
* - SC_OK on success
5555
* - non-zero on error
5656
*/
57-
status_t api_get_tips_pair(const iota_config_t* const config,
57+
status_t api_get_tips_pair(const iota_config_t* const tangle,
5858
const iota_client_service_t* const service,
5959
char** json_result);
6060

@@ -97,6 +97,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
9797
* fields include address, value, tag, and message. This API would also try to
9898
* find the transactions after bundle sent.
9999
*
100+
* @param[in] tangle IOTA API parameter configurations
100101
* @param[in] service IRI node end point service
101102
* @param[in] obj Input data in JSON
102103
* @param[out] json_result Result containing transaction objects in json format
@@ -105,7 +106,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
105106
* - SC_OK on success
106107
* - non-zero on error
107108
*/
108-
status_t api_send_transfer(const iota_config_t* const config,
109+
status_t api_send_transfer(const iota_config_t* const tangle,
109110
const iota_client_service_t* const service,
110111
const char* const obj, char** json_result);
111112

‎accelerator/common_core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ status_t ta_send_trytes(const iota_client_service_t* const service,
210210
return ret;
211211
}
212212

213-
status_t ta_generate_address(const iota_config_t* const config,
213+
status_t ta_generate_address(const iota_config_t* const tangle,
214214
const iota_client_service_t* const service,
215215
ta_generate_address_res_t* res) {
216216
if (res == NULL) {
@@ -221,7 +221,7 @@ status_t ta_generate_address(const iota_config_t* const config,
221221
hash243_queue_t out_address = NULL;
222222
flex_trit_t seed_trits[FLEX_TRIT_SIZE_243];
223223
flex_trits_from_trytes(seed_trits, NUM_TRITS_HASH,
224-
(const tryte_t*)config->seed, NUM_TRYTES_HASH,
224+
(const tryte_t*)tangle->seed, NUM_TRYTES_HASH,
225225
NUM_TRYTES_HASH);
226226
address_opt_t opt = {.security = 3, .start = 0, .total = 0};
227227

@@ -235,7 +235,7 @@ status_t ta_generate_address(const iota_config_t* const config,
235235
return ret;
236236
}
237237

238-
status_t ta_send_transfer(const iota_config_t* const config,
238+
status_t ta_send_transfer(const iota_config_t* const tangle,
239239
const iota_client_service_t* const service,
240240
const ta_send_transfer_req_t* const req,
241241
ta_send_transfer_res_t* res) {
@@ -275,7 +275,7 @@ status_t ta_send_transfer(const iota_config_t* const config,
275275
free(serialized_txn);
276276
}
277277

278-
ret = ta_send_trytes(service, config->depth, config->mwm, raw_tx);
278+
ret = ta_send_trytes(service, tangle->depth, tangle->mwm, raw_tx);
279279
if (ret) {
280280
goto done;
281281
}

‎accelerator/common_core.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ status_t cclient_get_tips(const iota_client_service_t* const service,
6464
* Generate and return an unused address from the seed. An unused address means
6565
* the address does not have any transaction with it yet.
6666
*
67+
* @param[in] tangle IOTA API parameter configurations
6768
* @param[in] service IRI node end point service
6869
* @param[out] res Result containing an unused address in
6970
* ta_generate_address_res_t
@@ -72,7 +73,7 @@ status_t cclient_get_tips(const iota_client_service_t* const service,
7273
* - SC_OK on success
7374
* - non-zero on error
7475
*/
75-
status_t ta_generate_address(const iota_config_t* const config,
76+
status_t ta_generate_address(const iota_config_t* const tangle,
7677
const iota_client_service_t* const service,
7778
ta_generate_address_res_t* res);
7879

@@ -83,7 +84,7 @@ status_t ta_generate_address(const iota_config_t* const config,
8384
* fields include address, value, tag, and message. This API would also try to
8485
* find the transactions after bundle sent.
8586
*
86-
* @param[in] config IOTA API parameter configurations
87+
* @param[in] tangle IOTA API parameter configurations
8788
* @param[in] service IRI node end point service
8889
* @param[in] req Request containing address value, message, tag in
8990
* ta_send_transfer_req_t
@@ -93,7 +94,7 @@ status_t ta_generate_address(const iota_config_t* const config,
9394
* - SC_OK on success
9495
* - non-zero on error
9596
*/
96-
status_t ta_send_transfer(const iota_config_t* const config,
97+
status_t ta_send_transfer(const iota_config_t* const tangle,
9798
const iota_client_service_t* const service,
9899
const ta_send_transfer_req_t* const req,
99100
ta_send_transfer_res_t* res);

‎accelerator/config.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#include "config.h"
22
#include "utils/logger_helper.h"
33

4-
#define CONFIG_LOGGER_ID "config"
4+
#define CONFIG_LOGGER_ID "TA"
55

66
static logger_id_t logger_id;
77

8-
status_t ta_config_init(ta_config_t* const info, iota_config_t* const config,
8+
status_t ta_config_init(ta_config_t* const info, iota_config_t* const tangle,
99
iota_client_service_t* const service) {
1010
status_t ret = SC_OK;
11-
if (info == NULL || config == NULL || service == NULL) {
11+
if (info == NULL || tangle == NULL || service == NULL) {
1212
return SC_TA_NULL;
1313
}
1414

@@ -23,9 +23,9 @@ status_t ta_config_init(ta_config_t* const info, iota_config_t* const config,
2323
info->thread_count = TA_THREAD_COUNT;
2424

2525
log_info(logger_id, "Initializing IRI configuration\n");
26-
config->depth = DEPTH;
27-
config->mwm = MWM;
28-
config->seed = SEED;
26+
tangle->depth = DEPTH;
27+
tangle->mwm = MWM;
28+
tangle->seed = SEED;
2929

3030
log_info(logger_id, "Initializing IRI connection\n");
3131
service->http.path = "/";

‎accelerator/config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ typedef struct ta_config_s {
5252
/** struct type of accelerator core */
5353
typedef struct ta_core_s {
5454
ta_config_t info; /**< accelerator configiuration structure */
55-
iota_config_t config; /**< iota configuration structure */
55+
iota_config_t tangle; /**< iota configuration structure */
5656
iota_client_service_t service; /**< iota connection structure */
5757
} ta_core_t;
5858

@@ -61,14 +61,14 @@ typedef struct ta_core_s {
6161
* Should be called first
6262
*
6363
* @param info[in] Tangle-accelerator configuration variables
64-
* @param config[in] iota configuration variables
64+
* @param tangle[in] iota configuration variables
6565
* @param service[in] IRI connection configuration variables
6666
*
6767
* @return
6868
* - SC_OK on success
6969
* - non-zero on error
7070
*/
71-
status_t ta_config_init(ta_config_t* const info, iota_config_t* const config,
71+
status_t ta_config_init(ta_config_t* const info, iota_config_t* const tangle,
7272
iota_client_service_t* const service);
7373

7474
/**

‎accelerator/server.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int main(int, char const**) {
5959
}
6060
logger_id = logger_helper_enable(MAIN_LOGGER_ID, LOGGER_DEBUG, true);
6161

62-
ta_config_init(&ta_core.info, &ta_core.config, &ta_core.service);
62+
ta_config_init(&ta_core.info, &ta_core.tangle, &ta_core.service);
6363

6464
mux.handle("/mam/{bundle:[A-Z9]{81}}")
6565
.method(served::method::OPTIONS,
@@ -166,7 +166,7 @@ int main(int, char const**) {
166166
char* json_result;
167167

168168
ret =
169-
api_get_tips_pair(&ta_core.config, &ta_core.service, &json_result);
169+
api_get_tips_pair(&ta_core.tangle, &ta_core.service, &json_result);
170170
ret = set_response_content(ret, &json_result);
171171
set_method_header(res, HTTP_METHOD_GET);
172172
res.set_status(ret);
@@ -208,7 +208,7 @@ int main(int, char const**) {
208208
status_t ret = SC_OK;
209209
char* json_result;
210210

211-
ret = api_generate_address(&ta_core.config, &ta_core.service,
211+
ret = api_generate_address(&ta_core.tangle, &ta_core.service,
212212
&json_result);
213213
ret = set_response_content(ret, &json_result);
214214
set_method_header(res, HTTP_METHOD_GET);
@@ -240,7 +240,7 @@ int main(int, char const**) {
240240
res.set_status(SC_HTTP_BAD_REQUEST);
241241
cJSON_Delete(json_obj);
242242
} else {
243-
ret = api_send_transfer(&ta_core.config, &ta_core.service,
243+
ret = api_send_transfer(&ta_core.tangle, &ta_core.service,
244244
req.body().c_str(), &json_result);
245245
ret = set_response_content(ret, &json_result);
246246
res.set_status(ret);

‎tests/driver.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void test_generate_address(void) {
3030
for (size_t count = 0; count < TEST_COUNT; count++) {
3131
clock_gettime(CLOCK_REALTIME, &start_time);
3232
TEST_ASSERT_FALSE(
33-
api_generate_address(&ta_core.config, &ta_core.service, &json_result));
33+
api_generate_address(&ta_core.tangle, &ta_core.service, &json_result));
3434
clock_gettime(CLOCK_REALTIME, &end_time);
3535
#if defined(ENABLE_STAT)
3636
printf("%lf\n", diff_time(start_time, end_time));
@@ -48,7 +48,7 @@ void test_get_tips_pair(void) {
4848
for (size_t count = 0; count < TEST_COUNT; count++) {
4949
clock_gettime(CLOCK_REALTIME, &start_time);
5050
TEST_ASSERT_FALSE(
51-
api_get_tips_pair(&ta_core.config, &ta_core.service, &json_result));
51+
api_get_tips_pair(&ta_core.tangle, &ta_core.service, &json_result));
5252
clock_gettime(CLOCK_REALTIME, &end_time);
5353
#if defined(ENABLE_STAT)
5454
printf("%lf\n", diff_time(start_time, end_time));
@@ -87,7 +87,7 @@ void test_send_transfer(void) {
8787

8888
for (size_t count = 0; count < TEST_COUNT; count++) {
8989
clock_gettime(CLOCK_REALTIME, &start_time);
90-
TEST_ASSERT_FALSE(api_send_transfer(&ta_core.config, &ta_core.service, json,
90+
TEST_ASSERT_FALSE(api_send_transfer(&ta_core.tangle, &ta_core.service, json,
9191
&json_result));
9292
clock_gettime(CLOCK_REALTIME, &end_time);
9393
#if defined(ENABLE_STAT)
@@ -175,7 +175,7 @@ void test_receive_mam_message(void) {
175175
int main(void) {
176176
UNITY_BEGIN();
177177

178-
ta_config_init(&ta_core.info, &ta_core.config, &ta_core.service);
178+
ta_config_init(&ta_core.info, &ta_core.tangle, &ta_core.service);
179179

180180
printf("Total samples for each API test: %d\n", TEST_COUNT);
181181
RUN_TEST(test_generate_address);

‎tests/test_common.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using ::testing::AtLeast;
88
using ::testing::ElementsAreArray;
99

1010
APIMock APIMockObj;
11-
iota_config_t config;
11+
iota_config_t tangle;
1212
iota_client_service_t service;
1313

1414
TEST(GetTxnToApproveTest, TrunkBranchHashTest) {
@@ -73,7 +73,7 @@ TEST(FindTxnTest, TxnHashTest) {
7373
}
7474

7575
TEST(GenAdressTest, GetNewAddressTest) {
76-
config.seed = SEED;
76+
tangle.seed = SEED;
7777
hash243_queue_entry_t* q_iter = NULL;
7878
ta_generate_address_res_t* res = ta_generate_address_res_new();
7979
flex_trit_t hash_trits_1[FLEX_TRIT_SIZE_243];
@@ -84,7 +84,7 @@ TEST(GenAdressTest, GetNewAddressTest) {
8484
EXPECT_CALL(APIMockObj, iota_client_get_new_address(_, _, _, _))
8585
.Times(AtLeast(1));
8686

87-
EXPECT_EQ(ta_generate_address(&config, &service, res), 0);
87+
EXPECT_EQ(ta_generate_address(&tangle, &service, res), 0);
8888
CDL_FOREACH(res->addresses, q_iter) {
8989
EXPECT_FALSE(memcmp(q_iter->hash, hash_trits_1,
9090
sizeof(flex_trit_t) * FLEX_TRIT_SIZE_243));
@@ -160,7 +160,7 @@ TEST(SendTransferTest, SendTransferTest) {
160160
EXPECT_CALL(APIMockObj, iota_client_find_transactions(_, _, _))
161161
.Times(AtLeast(1));
162162

163-
EXPECT_EQ(ta_send_transfer(&config, &service, req, res), 0);
163+
EXPECT_EQ(ta_send_transfer(&tangle, &service, req, res), 0);
164164
txn_hash = hash243_queue_peek(res->hash);
165165
EXPECT_FALSE(
166166
memcmp(txn_hash, hash_trits_1, sizeof(flex_trit_t) * FLEX_TRIT_SIZE_243));

0 commit comments

Comments
 (0)