diff options
Diffstat (limited to 'src/testing/testing_api_cmd_bank_history_credit.c')
-rw-r--r-- | src/testing/testing_api_cmd_bank_history_credit.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/testing/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c index 069f62cb0..c052b55fb 100644 --- a/src/testing/testing_api_cmd_bank_history_credit.c +++ b/src/testing/testing_api_cmd_bank_history_credit.c | |||
@@ -164,7 +164,7 @@ print_expected (struct History *h, | |||
164 | TALER_amount2s (&h[i].details.amount), | 164 | TALER_amount2s (&h[i].details.amount), |
165 | (unsigned long long) h[i].row_id, | 165 | (unsigned long long) h[i].row_id, |
166 | TALER_B2S (&h[i].details.reserve_pub), | 166 | TALER_B2S (&h[i].details.reserve_pub), |
167 | h[i].details.debit_account_url); | 167 | h[i].details.debit_account_uri); |
168 | } | 168 | } |
169 | } | 169 | } |
170 | 170 | ||
@@ -313,11 +313,11 @@ build_history (struct TALER_TESTING_Interpreter *is, | |||
313 | total, | 313 | total, |
314 | pos * 2); | 314 | pos * 2); |
315 | h[pos].url = GNUNET_strdup (debit_account); | 315 | h[pos].url = GNUNET_strdup (debit_account); |
316 | h[pos].details.debit_account_url = h[pos].url; | 316 | h[pos].details.debit_account_uri = h[pos].url; |
317 | h[pos].details.amount = *amount; | 317 | h[pos].details.amount = *amount; |
318 | h[pos].row_id = *row_id; | 318 | h[pos].row_id = *row_id; |
319 | h[pos].details.reserve_pub = *reserve_pub; | 319 | h[pos].details.reserve_pub = *reserve_pub; |
320 | h[pos].details.credit_account_url = exchange_credit_url; | 320 | h[pos].details.credit_account_uri = exchange_credit_url; |
321 | pos++; | 321 | pos++; |
322 | } | 322 | } |
323 | GNUNET_assert (GNUNET_YES == ok); | 323 | GNUNET_assert (GNUNET_YES == ok); |
@@ -364,16 +364,16 @@ check_result (struct History *h, | |||
364 | &details->reserve_pub)) || | 364 | &details->reserve_pub)) || |
365 | (0 != TALER_amount_cmp (&h[off].details.amount, | 365 | (0 != TALER_amount_cmp (&h[off].details.amount, |
366 | &details->amount)) || | 366 | &details->amount)) || |
367 | (0 != strcasecmp (h[off].details.debit_account_url, | 367 | (0 != strcasecmp (h[off].details.debit_account_uri, |
368 | details->debit_account_url)) ) | 368 | details->debit_account_uri)) ) |
369 | { | 369 | { |
370 | GNUNET_break (0); | 370 | GNUNET_break (0); |
371 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 371 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
372 | "expected debit_account_url: %s\n", | 372 | "expected debit_account_uri: %s\n", |
373 | details->debit_account_url); | 373 | details->debit_account_uri); |
374 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 374 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
375 | "actual debit_account_url: %s\n", | 375 | "actual debit_account_uri: %s\n", |
376 | h[off].details.debit_account_url); | 376 | h[off].details.debit_account_uri); |
377 | print_expected (h, | 377 | print_expected (h, |
378 | total, | 378 | total, |
379 | off); | 379 | off); |
@@ -521,6 +521,7 @@ history_run (void *cls, | |||
521 | &hs->auth, | 521 | &hs->auth, |
522 | row_id, | 522 | row_id, |
523 | hs->num_results, | 523 | hs->num_results, |
524 | GNUNET_TIME_UNIT_ZERO, | ||
524 | &history_cb, | 525 | &history_cb, |
525 | is); | 526 | is); |
526 | GNUNET_assert (NULL != hs->hh); | 527 | GNUNET_assert (NULL != hs->hh); |
@@ -554,23 +555,12 @@ history_cleanup (void *cls, | |||
554 | } | 555 | } |
555 | 556 | ||
556 | 557 | ||
557 | /** | ||
558 | * Make a "history" CMD. | ||
559 | * | ||
560 | * @param label command label. | ||
561 | * @param auth authentication data to talk with the wire gateway | ||
562 | * @param start_row_reference reference to a command that can | ||
563 | * offer a row identifier, to be used as the starting row | ||
564 | * to accept in the result. | ||
565 | * @param num_results how many rows we want in the result. | ||
566 | * @return the command. | ||
567 | */ | ||
568 | struct TALER_TESTING_Command | 558 | struct TALER_TESTING_Command |
569 | TALER_TESTING_cmd_bank_credits (const char *label, | 559 | TALER_TESTING_cmd_bank_credits ( |
570 | const struct | 560 | const char *label, |
571 | TALER_BANK_AuthenticationData *auth, | 561 | const struct TALER_BANK_AuthenticationData *auth, |
572 | const char *start_row_reference, | 562 | const char *start_row_reference, |
573 | long long num_results) | 563 | long long num_results) |
574 | { | 564 | { |
575 | struct HistoryState *hs; | 565 | struct HistoryState *hs; |
576 | 566 | ||