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

Commit

Permalink
fix(config): Rename iota_config_t variable
Browse files Browse the repository at this point in the history
  • Loading branch information
Yu Wei Wu committed Mar 22, 2019
1 parent 1a91bf7 commit 7d431e5
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 39 deletions.
12 changes: 6 additions & 6 deletions accelerator/apis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ status_t api_get_tips(const iota_client_service_t* const service,
return ret;
}

status_t api_get_tips_pair(const iota_config_t* const config,
status_t api_get_tips_pair(const iota_config_t* const tangle,
const iota_client_service_t* const service,
char** json_result) {
status_t ret = SC_OK;
Expand All @@ -54,7 +54,7 @@ status_t api_get_tips_pair(const iota_config_t* const config,
goto done;
}

ret = cclient_get_txn_to_approve(service, config->depth, res);
ret = cclient_get_txn_to_approve(service, tangle->depth, res);
if (ret) {
goto done;
}
Expand All @@ -66,7 +66,7 @@ status_t api_get_tips_pair(const iota_config_t* const config,
return ret;
}

status_t api_generate_address(const iota_config_t* const config,
status_t api_generate_address(const iota_config_t* const tangle,
const iota_client_service_t* const service,
char** json_result) {
status_t ret = SC_OK;
Expand All @@ -76,7 +76,7 @@ status_t api_generate_address(const iota_config_t* const config,
goto done;
}

ret = ta_generate_address(config, service, res);
ret = ta_generate_address(tangle, service, res);
if (ret) {
goto done;
}
Expand Down Expand Up @@ -205,7 +205,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
return ret;
}

status_t api_send_transfer(const iota_config_t* const config,
status_t api_send_transfer(const iota_config_t* const tangle,
const iota_client_service_t* const service,
const char* const obj, char** json_result) {
status_t ret = SC_OK;
Expand All @@ -225,7 +225,7 @@ status_t api_send_transfer(const iota_config_t* const config,
goto done;
}

ret = ta_send_transfer(config, service, req, res);
ret = ta_send_transfer(tangle, service, req, res);
if (ret) {
goto done;
}
Expand Down
11 changes: 6 additions & 5 deletions accelerator/apis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ extern "C" {
* Generate and return an unused address from the seed. An unused address means
* the address does not have any transaction with it yet.
*
* @param[in] config IOTA API parameter configurations
* @param[in] tangle IOTA API parameter configurations
* @param[in] service IRI node end point service
* @param[out] json_result Result containing an unused address in json format
*
* @return
* - SC_OK on success
* - non-zero on error
*/
status_t api_generate_address(const iota_config_t* const config,
status_t api_generate_address(const iota_config_t* const tangle,
const iota_client_service_t* const service,
char** json_result);

Expand All @@ -46,15 +46,15 @@ status_t api_generate_address(const iota_config_t* const config,
* Get a tips pair as trunk/branch transactions for transaction construction.
* The result is char array in json format:
*
* @param[in] config IOTA API parameter configurations
* @param[in] tangle IOTA API parameter configurations
* @param[in] service IRI node end point service
* @param[out] json_result Result containing a tips pair in json format
*
* @return
* - SC_OK on success
* - non-zero on error
*/
status_t api_get_tips_pair(const iota_config_t* const config,
status_t api_get_tips_pair(const iota_config_t* const tangle,
const iota_client_service_t* const service,
char** json_result);

Expand Down Expand Up @@ -97,6 +97,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
* fields include address, value, tag, and message. This API would also try to
* find the transactions after bundle sent.
*
* @param[in] tangle IOTA API parameter configurations
* @param[in] service IRI node end point service
* @param[in] obj Input data in JSON
* @param[out] json_result Result containing transaction objects in json format
Expand All @@ -105,7 +106,7 @@ status_t api_receive_mam_message(const iota_client_service_t* const service,
* - SC_OK on success
* - non-zero on error
*/
status_t api_send_transfer(const iota_config_t* const config,
status_t api_send_transfer(const iota_config_t* const tangle,
const iota_client_service_t* const service,
const char* const obj, char** json_result);

Expand Down
8 changes: 4 additions & 4 deletions accelerator/common_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ status_t ta_send_trytes(const iota_client_service_t* const service,
return ret;
}

status_t ta_generate_address(const iota_config_t* const config,
status_t ta_generate_address(const iota_config_t* const tangle,
const iota_client_service_t* const service,
ta_generate_address_res_t* res) {
if (res == NULL) {
Expand All @@ -221,7 +221,7 @@ status_t ta_generate_address(const iota_config_t* const config,
hash243_queue_t out_address = NULL;
flex_trit_t seed_trits[FLEX_TRIT_SIZE_243];
flex_trits_from_trytes(seed_trits, NUM_TRITS_HASH,
(const tryte_t*)config->seed, NUM_TRYTES_HASH,
(const tryte_t*)tangle->seed, NUM_TRYTES_HASH,
NUM_TRYTES_HASH);
address_opt_t opt = {.security = 3, .start = 0, .total = 0};

Expand All @@ -235,7 +235,7 @@ status_t ta_generate_address(const iota_config_t* const config,
return ret;
}

status_t ta_send_transfer(const iota_config_t* const config,
status_t ta_send_transfer(const iota_config_t* const tangle,
const iota_client_service_t* const service,
const ta_send_transfer_req_t* const req,
ta_send_transfer_res_t* res) {
Expand Down Expand Up @@ -275,7 +275,7 @@ status_t ta_send_transfer(const iota_config_t* const config,
free(serialized_txn);
}

ret = ta_send_trytes(service, config->depth, config->mwm, raw_tx);
ret = ta_send_trytes(service, tangle->depth, tangle->mwm, raw_tx);
if (ret) {
goto done;
}
Expand Down
7 changes: 4 additions & 3 deletions accelerator/common_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ status_t cclient_get_tips(const iota_client_service_t* const service,
* Generate and return an unused address from the seed. An unused address means
* the address does not have any transaction with it yet.
*
* @param[in] tangle IOTA API parameter configurations
* @param[in] service IRI node end point service
* @param[out] res Result containing an unused address in
* ta_generate_address_res_t
Expand All @@ -72,7 +73,7 @@ status_t cclient_get_tips(const iota_client_service_t* const service,
* - SC_OK on success
* - non-zero on error
*/
status_t ta_generate_address(const iota_config_t* const config,
status_t ta_generate_address(const iota_config_t* const tangle,
const iota_client_service_t* const service,
ta_generate_address_res_t* res);

Expand All @@ -83,7 +84,7 @@ status_t ta_generate_address(const iota_config_t* const config,
* fields include address, value, tag, and message. This API would also try to
* find the transactions after bundle sent.
*
* @param[in] config IOTA API parameter configurations
* @param[in] tangle IOTA API parameter configurations
* @param[in] service IRI node end point service
* @param[in] req Request containing address value, message, tag in
* ta_send_transfer_req_t
Expand All @@ -93,7 +94,7 @@ status_t ta_generate_address(const iota_config_t* const config,
* - SC_OK on success
* - non-zero on error
*/
status_t ta_send_transfer(const iota_config_t* const config,
status_t ta_send_transfer(const iota_config_t* const tangle,
const iota_client_service_t* const service,
const ta_send_transfer_req_t* const req,
ta_send_transfer_res_t* res);
Expand Down
12 changes: 6 additions & 6 deletions accelerator/config.c
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#include "config.h"
#include "utils/logger_helper.h"

#define CONFIG_LOGGER_ID "config"
#define CONFIG_LOGGER_ID "TA"

static logger_id_t logger_id;

status_t ta_config_init(ta_config_t* const info, iota_config_t* const config,
status_t ta_config_init(ta_config_t* const info, iota_config_t* const tangle,
iota_client_service_t* const service) {
status_t ret = SC_OK;
if (info == NULL || config == NULL || service == NULL) {
if (info == NULL || tangle == NULL || service == NULL) {
return SC_TA_NULL;
}

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

log_info(logger_id, "Initializing IRI configuration\n");
config->depth = DEPTH;
config->mwm = MWM;
config->seed = SEED;
tangle->depth = DEPTH;
tangle->mwm = MWM;
tangle->seed = SEED;

log_info(logger_id, "Initializing IRI connection\n");
service->http.path = "/";
Expand Down
6 changes: 3 additions & 3 deletions accelerator/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ typedef struct ta_config_s {
/** struct type of accelerator core */
typedef struct ta_core_s {
ta_config_t info; /**< accelerator configiuration structure */
iota_config_t config; /**< iota configuration structure */
iota_config_t tangle; /**< iota configuration structure */
iota_client_service_t service; /**< iota connection structure */
} ta_core_t;

Expand All @@ -61,14 +61,14 @@ typedef struct ta_core_s {
* Should be called first
*
* @param info[in] Tangle-accelerator configuration variables
* @param config[in] iota configuration variables
* @param tangle[in] iota configuration variables
* @param service[in] IRI connection configuration variables
*
* @return
* - SC_OK on success
* - non-zero on error
*/
status_t ta_config_init(ta_config_t* const info, iota_config_t* const config,
status_t ta_config_init(ta_config_t* const info, iota_config_t* const tangle,
iota_client_service_t* const service);

/**
Expand Down
8 changes: 4 additions & 4 deletions accelerator/server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ int main(int, char const**) {
}
logger_id = logger_helper_enable(MAIN_LOGGER_ID, LOGGER_DEBUG, true);

ta_config_init(&ta_core.info, &ta_core.config, &ta_core.service);
ta_config_init(&ta_core.info, &ta_core.tangle, &ta_core.service);

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

ret =
api_get_tips_pair(&ta_core.config, &ta_core.service, &json_result);
api_get_tips_pair(&ta_core.tangle, &ta_core.service, &json_result);
ret = set_response_content(ret, &json_result);
set_method_header(res, HTTP_METHOD_GET);
res.set_status(ret);
Expand Down Expand Up @@ -208,7 +208,7 @@ int main(int, char const**) {
status_t ret = SC_OK;
char* json_result;

ret = api_generate_address(&ta_core.config, &ta_core.service,
ret = api_generate_address(&ta_core.tangle, &ta_core.service,
&json_result);
ret = set_response_content(ret, &json_result);
set_method_header(res, HTTP_METHOD_GET);
Expand Down Expand Up @@ -240,7 +240,7 @@ int main(int, char const**) {
res.set_status(SC_HTTP_BAD_REQUEST);
cJSON_Delete(json_obj);
} else {
ret = api_send_transfer(&ta_core.config, &ta_core.service,
ret = api_send_transfer(&ta_core.tangle, &ta_core.service,
req.body().c_str(), &json_result);
ret = set_response_content(ret, &json_result);
res.set_status(ret);
Expand Down
8 changes: 4 additions & 4 deletions tests/driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void test_generate_address(void) {
for (size_t count = 0; count < TEST_COUNT; count++) {
clock_gettime(CLOCK_REALTIME, &start_time);
TEST_ASSERT_FALSE(
api_generate_address(&ta_core.config, &ta_core.service, &json_result));
api_generate_address(&ta_core.tangle, &ta_core.service, &json_result));
clock_gettime(CLOCK_REALTIME, &end_time);
#if defined(ENABLE_STAT)
printf("%lf\n", diff_time(start_time, end_time));
Expand All @@ -48,7 +48,7 @@ void test_get_tips_pair(void) {
for (size_t count = 0; count < TEST_COUNT; count++) {
clock_gettime(CLOCK_REALTIME, &start_time);
TEST_ASSERT_FALSE(
api_get_tips_pair(&ta_core.config, &ta_core.service, &json_result));
api_get_tips_pair(&ta_core.tangle, &ta_core.service, &json_result));
clock_gettime(CLOCK_REALTIME, &end_time);
#if defined(ENABLE_STAT)
printf("%lf\n", diff_time(start_time, end_time));
Expand Down Expand Up @@ -87,7 +87,7 @@ void test_send_transfer(void) {

for (size_t count = 0; count < TEST_COUNT; count++) {
clock_gettime(CLOCK_REALTIME, &start_time);
TEST_ASSERT_FALSE(api_send_transfer(&ta_core.config, &ta_core.service, json,
TEST_ASSERT_FALSE(api_send_transfer(&ta_core.tangle, &ta_core.service, json,
&json_result));
clock_gettime(CLOCK_REALTIME, &end_time);
#if defined(ENABLE_STAT)
Expand Down Expand Up @@ -175,7 +175,7 @@ void test_receive_mam_message(void) {
int main(void) {
UNITY_BEGIN();

ta_config_init(&ta_core.info, &ta_core.config, &ta_core.service);
ta_config_init(&ta_core.info, &ta_core.tangle, &ta_core.service);

printf("Total samples for each API test: %d\n", TEST_COUNT);
RUN_TEST(test_generate_address);
Expand Down
8 changes: 4 additions & 4 deletions tests/test_common.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using ::testing::AtLeast;
using ::testing::ElementsAreArray;

APIMock APIMockObj;
iota_config_t config;
iota_config_t tangle;
iota_client_service_t service;

TEST(GetTxnToApproveTest, TrunkBranchHashTest) {
Expand Down Expand Up @@ -73,7 +73,7 @@ TEST(FindTxnTest, TxnHashTest) {
}

TEST(GenAdressTest, GetNewAddressTest) {
config.seed = SEED;
tangle.seed = SEED;
hash243_queue_entry_t* q_iter = NULL;
ta_generate_address_res_t* res = ta_generate_address_res_new();
flex_trit_t hash_trits_1[FLEX_TRIT_SIZE_243];
Expand All @@ -84,7 +84,7 @@ TEST(GenAdressTest, GetNewAddressTest) {
EXPECT_CALL(APIMockObj, iota_client_get_new_address(_, _, _, _))
.Times(AtLeast(1));

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

EXPECT_EQ(ta_send_transfer(&config, &service, req, res), 0);
EXPECT_EQ(ta_send_transfer(&tangle, &service, req, res), 0);
txn_hash = hash243_queue_peek(res->hash);
EXPECT_FALSE(
memcmp(txn_hash, hash_trits_1, sizeof(flex_trit_t) * FLEX_TRIT_SIZE_243));
Expand Down

0 comments on commit 7d431e5

Please sign in to comment.