diff options
Diffstat (limited to 'src/bank-lib/testing_api_cmd_history.c')
| -rw-r--r-- | src/bank-lib/testing_api_cmd_history.c | 188 |
1 files changed, 149 insertions, 39 deletions
diff --git a/src/bank-lib/testing_api_cmd_history.c b/src/bank-lib/testing_api_cmd_history.c index 37e15af82..a50fd9bab 100644 --- a/src/bank-lib/testing_api_cmd_history.c +++ b/src/bank-lib/testing_api_cmd_history.c @@ -1,4 +1,4 @@ -/* + /* This file is part of TALER Copyright (C) 2018 Taler Systems SA @@ -40,19 +40,16 @@ */ struct HistoryState { - /** * Base URL of the bank offering the "history" operation. */ const char *bank_url; - /** * Account number to ask the history for. */ uint64_t account_no; - /** * Which type of records we are interested: in-transfers * / out-transfers / rejected transfers. @@ -65,7 +62,9 @@ struct HistoryState const char *start_row_reference; /** - * How many rows we want in the result. + * How many rows we want in the result, _at most_. In + * the case of /history-range, we fake this value with + * INT64_MAX. */ long long num_results; @@ -263,6 +262,45 @@ print_expected (struct History *h, } } + + +/** + * Tell if the current item is beyond the allowed limit. + * + * @param total current number of items in the built history list. + * Note, this is the list we build locally and compare with + * what the server returned. + * @param hs the history CMD state. + * @param pos current item to be evaluated or not (if the list + * has already enough elements). + * @return GNUNET_OK / GNUNET_NO. + */ +static int +build_history_hit_limit (uint64_t total, + const struct HistoryState *hs, + const struct TALER_TESTING_Command *pos) +{ + /* "/history-range" case. */ + if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->start_date.abs_value_us) + { + const struct GNUNET_TIME_Absolute *timestamp; + + GNUNET_assert (GNUNET_OK == + TALER_TESTING_get_trait_absolute_time (pos, + 0, + ×tamp)); + + GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->end_date.abs_value_us); + + return timestamp->abs_value_us >= hs->end_date.abs_value_us; + } + + return total >= hs->num_results; +} + + /** * This function constructs the list of history elements that * interest the account number of the caller. It has two main @@ -305,10 +343,10 @@ build_history (struct TALER_TESTING_Interpreter *is, if (NULL != hs->start_row_reference) { - TALER_LOG_INFO ("`%s': start row given via reference `%s'\n", - TALER_TESTING_interpreter_get_current_label - (is), - hs->start_row_reference); + TALER_LOG_INFO + ("`%s': start row given via reference `%s'\n", + TALER_TESTING_interpreter_get_current_label (is), + hs->start_row_reference); add_incoming_cmd = TALER_TESTING_interpreter_lookup_command (is, hs->start_row_reference); GNUNET_assert (NULL != add_incoming_cmd); @@ -316,7 +354,9 @@ build_history (struct TALER_TESTING_Interpreter *is, (add_incoming_cmd, 0, &row_id_start)); } - GNUNET_assert (0 != hs->num_results); + GNUNET_assert ((0 != hs->num_results) || + (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->start_date.abs_value_us)); if (0 == is->ip) { @@ -344,9 +384,9 @@ build_history (struct TALER_TESTING_Interpreter *is, if (NULL == row_id_start) ok = GNUNET_YES; - /* This loop counts how many commands in the list off _all_ - * the commands belong to the history of the caller. This - * is stored in the @var total variable. */ + /* This loop counts how many commands _later than "start"_ belong + * to the history of the caller. This is stored in the @var total + * variable. */ for (unsigned int off = start;off != end + inc; off += inc) { const struct TALER_TESTING_Command *pos = &is->commands[off]; @@ -358,11 +398,12 @@ build_history (struct TALER_TESTING_Interpreter *is, * that do not offer a "row_id" trait. Such skipped CMDs are * not interesting for building a history. */ - - if (GNUNET_OK != TALER_TESTING_get_trait_uint64 - (pos, 0, &row_id)) + if (GNUNET_OK != TALER_TESTING_get_trait_uint64 (pos, + 0, + &row_id)) continue; + /* Seek "/history" starting row. */ if (NULL != row_id_start) { if (*row_id_start == *row_id) @@ -373,12 +414,32 @@ build_history (struct TALER_TESTING_Interpreter *is, continue; } } + + /* Seek "/history-range" starting row, _if_ that's the case */ + if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->start_date.abs_value_us) + { + const struct GNUNET_TIME_Absolute *timestamp; + + TALER_TESTING_get_trait_absolute_time (pos, + 0, + ×tamp); + if (hs->start_date.abs_value_us <= timestamp->abs_value_us) + { + total = 0; + ok = GNUNET_YES; + continue; + } + } + /* when 'start' was _not_ given, then ok == GNUNET_YES */ if (GNUNET_NO == ok) continue; /* skip until we find the marker */ - if (total >= hs->num_results * inc) - break; /* hit limit specified by command */ + if (build_history_hit_limit (total, + hs, + pos)) + break; cancelled = test_cancelled (is, off); @@ -435,7 +496,6 @@ build_history (struct TALER_TESTING_Interpreter *is, if (NULL == row_id_start) ok = GNUNET_YES; - /** * This loop _only_ populates the array of history elements. */ @@ -457,12 +517,32 @@ build_history (struct TALER_TESTING_Interpreter *is, if (*row_id_start == *row_id) { - /* Doesn't count, start is excluded from output. */ + /* Warning: this zeroing is superfluous, as total doesn't + * get incremented if 'start' was given and couldn't be found. + */ total = 0; ok = GNUNET_YES; continue; } } + + /* Seek "/history-range" starting row, _if_ that's the case */ + if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->start_date.abs_value_us) + { + const struct GNUNET_TIME_Absolute *timestamp; + + TALER_TESTING_get_trait_absolute_time (pos, + 0, + ×tamp); + if (hs->start_date.abs_value_us <= timestamp->abs_value_us) + { + total = 0; + ok = GNUNET_YES; + continue; + } + } + if (GNUNET_NO == ok) { TALER_LOG_INFO ("Skip on `%s'\n", @@ -470,7 +550,9 @@ build_history (struct TALER_TESTING_Interpreter *is, continue; /* skip until we find the marker */ } - if (total >= hs->num_results * inc) + if (build_history_hit_limit (total, + hs, + pos)) { TALER_LOG_INFO ("hit limit specified by command\n"); break; @@ -490,6 +572,12 @@ build_history (struct TALER_TESTING_Interpreter *is, (unsigned long long) *credit_account_no, (unsigned long long) hs->account_no); + /** + * Discard transactions where the audited account played + * _both_ the credit and the debit roles, but _only if_ + * the audit goes on both directions.. This needs more + * explaination! + */ if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && (hs->account_no == *credit_account_no)) && ( (0 != (hs->direction & TALER_BANK_DIRECTION_DEBIT)) && @@ -513,6 +601,10 @@ build_history (struct TALER_TESTING_Interpreter *is, GNUNET_assert (NULL != bank_hostname); bank_hostname += 3; + /* Next two blocks only put the 'direction' and 'banking' + * information. */ + + /* Asked for credit, and account got the credit. */ if ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && (hs->account_no == *credit_account_no)) { @@ -528,6 +620,8 @@ build_history (struct TALER_TESTING_Interpreter *is, bank_hostname, (unsigned long long) *debit_account_no); } + + /* Asked for debit, and account got the debit. */ if ( (0 != (hs->direction & TALER_BANK_DIRECTION_DEBIT)) && (hs->account_no == *debit_account_no)) { @@ -543,6 +637,9 @@ build_history (struct TALER_TESTING_Interpreter *is, bank_hostname, (unsigned long long) *credit_account_no); } + + /* This block _completes_ the information of the current item, + * with amount / subject / exchange URL. */ if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && (hs->account_no == *credit_account_no)) || ( (0 != (hs->direction & TALER_BANK_DIRECTION_DEBIT)) && @@ -690,9 +787,8 @@ history_cb (void *cls, struct TALER_TESTING_Interpreter *is = cls; struct HistoryState *hs = is->commands[is->ip].cls; - /* Possibly we got the 204 status code - * as a "end of list" marker. */ - if (MHD_HTTP_OK != http_status) + /*NOTE: "204 No Content" is used to signal the end of results.*/ + if (MHD_HTTP_NO_CONTENT == http_status) { hs->hh = NULL; if ( (hs->results_obtained != compute_result_count (is)) || @@ -719,6 +815,19 @@ history_cb (void *cls, TALER_TESTING_interpreter_next (is); return; } + + if (MHD_HTTP_OK != http_status) + { + hs->hh = NULL; + GNUNET_log + (GNUNET_ERROR_TYPE_ERROR, + "Unwanted response code from /history[-range]: %u\n", + http_status); + TALER_TESTING_interpreter_fail (is); + return; + } + + /* check current element */ if (GNUNET_OK != check_result (is, hs->results_obtained, dir, @@ -774,8 +883,9 @@ history_run (void *cls, if (NULL == history_cmd) TALER_TESTING_FAIL (is); - if (GNUNET_OK != TALER_TESTING_get_trait_uint64 - (history_cmd, 0, &row_id_ptr)) + if (GNUNET_OK != TALER_TESTING_get_trait_uint64 (history_cmd, + 0, + &row_id_ptr)) TALER_TESTING_FAIL (is); row_id = *row_id_ptr; @@ -830,10 +940,13 @@ history_range_run (void *cls, if (GNUNET_OK != TALER_TESTING_get_trait_absolute_time (history_cmd, 0, &start_date)) TALER_TESTING_FAIL (is); + hs->start_date = *start_date; } else { - GNUNET_assert (UINT64_MAX != hs->start_date.abs_value_us); + /* no trait wanted. */ + GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->start_date.abs_value_us); start_date = &hs->start_date; } @@ -851,10 +964,13 @@ history_range_run (void *cls, if (GNUNET_OK != TALER_TESTING_get_trait_absolute_time (history_cmd, 0, &end_date)) TALER_TESTING_FAIL (is); + hs->end_date = *end_date; } else { - GNUNET_assert (UINT64_MAX != hs->end_date.abs_value_us); + /* no trait wanted. */ + GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != + hs->end_date.abs_value_us); end_date = &hs->end_date; } @@ -933,6 +1049,8 @@ TALER_TESTING_cmd_bank_history hs->start_row_reference = start_row_reference; hs->num_results = num_results; hs->ascending = ascending; + hs->start_date = GNUNET_TIME_UNIT_FOREVER_ABS; + hs->end_date = GNUNET_TIME_UNIT_FOREVER_ABS; struct TALER_TESTING_Command cmd = { .label = label, @@ -962,8 +1080,6 @@ TALER_TESTING_cmd_bank_history * @param end_row_reference reference to a command that can * offer a absolute time to use as the 'end' argument * for "/history-range". - * @param num_result how many rows we want in the result. - * * @return the command. */ struct TALER_TESTING_Command @@ -974,8 +1090,7 @@ TALER_TESTING_cmd_bank_history_range enum TALER_BANK_Direction direction, unsigned int ascending, const char *start_row_reference, - const char *end_row_reference, - long long num_results) + const char *end_row_reference) { struct HistoryState *hs; @@ -985,7 +1100,6 @@ TALER_TESTING_cmd_bank_history_range hs->direction = direction; hs->start_row_reference = start_row_reference; hs->end_row_reference = end_row_reference; - hs->num_results = num_results; hs->ascending = ascending; hs->start_date = GNUNET_TIME_UNIT_FOREVER_ABS; hs->end_date = GNUNET_TIME_UNIT_FOREVER_ABS; @@ -1016,8 +1130,6 @@ TALER_TESTING_cmd_bank_history_range * of "/history-range". * @param end_date value for the 'end' argument * of "/history-range". - * @param num_result how many rows we want in the result. - * * @return the command. */ struct TALER_TESTING_Command @@ -1028,8 +1140,7 @@ TALER_TESTING_cmd_bank_history_range_with_dates enum TALER_BANK_Direction direction, unsigned int ascending, struct GNUNET_TIME_Absolute start_date, - struct GNUNET_TIME_Absolute end_date, - long long num_results) + struct GNUNET_TIME_Absolute end_date) { struct HistoryState *hs; @@ -1037,10 +1148,9 @@ TALER_TESTING_cmd_bank_history_range_with_dates hs->bank_url = bank_url; hs->account_no = account_no; hs->direction = direction; - hs->num_results = num_results; hs->ascending = ascending; hs->start_date = start_date; - hs->end_date = start_date; + hs->end_date = end_date; struct TALER_TESTING_Command cmd = { .label = label, |