From 7d23dbe6ee21afc6d28df50516e694f205aada29 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 28 Oct 2021 21:05:53 +0200 Subject: -work on FTBFS --- src/testing/testing_api_cmd_merchant_get_order.c | 76 ++++++++++-------------- 1 file changed, 30 insertions(+), 46 deletions(-) (limited to 'src/testing/testing_api_cmd_merchant_get_order.c') diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c index 34c2b0b0..1977f792 100644 --- a/src/testing/testing_api_cmd_merchant_get_order.c +++ b/src/testing/testing_api_cmd_merchant_get_order.c @@ -185,7 +185,6 @@ merchant_get_order_cb ( if (GNUNET_OK != TALER_TESTING_get_trait_contract_terms (order_cmd, - 0, &expected_contract_terms)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -200,16 +199,15 @@ merchant_get_order_cb ( for (unsigned int i = 0; i < gos->forgets_length; ++i) { const struct TALER_TESTING_Command *forget_cmd; - const unsigned int *paths_length; + const uint32_t *paths_length; forget_cmd = TALER_TESTING_interpreter_lookup_command ( gos->is, gos->forgets[i]); if (GNUNET_OK != - TALER_TESTING_get_trait_uint32 (forget_cmd, - 0, - &paths_length)) + TALER_TESTING_get_trait_paths_length (forget_cmd, + &paths_length)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Couldn't fetch forget paths length\n"); @@ -219,13 +217,13 @@ merchant_get_order_cb ( for (unsigned int j = 0; j < *paths_length; ++j) { - const char *path; + const char **path; int res = GNUNET_OK; if (GNUNET_OK != - TALER_TESTING_get_trait_string (forget_cmd, - j, - &path)) + TALER_TESTING_get_trait_paths (forget_cmd, + j, + &path)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Couldn't fetch forget path\n"); @@ -235,7 +233,7 @@ merchant_get_order_cb ( GNUNET_assert (GNUNET_OK == TALER_JSON_expand_path (ct, - path, + *path, &apply_forget, &res)); GNUNET_assert (GNUNET_OK == res); @@ -279,7 +277,6 @@ merchant_get_order_cb ( if (GNUNET_OK != TALER_TESTING_get_trait_wtid (transfer_cmd, - 0, &wtid)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -297,19 +294,18 @@ merchant_get_order_cb ( } } { - const char *exchange_url; + const char **exchange_url; if (GNUNET_OK != - TALER_TESTING_get_trait_string (transfer_cmd, - 1, - &exchange_url)) + TALER_TESTING_get_trait_exchange_url (transfer_cmd, + &exchange_url)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not fetch wire transfer exchange url\n"); TALER_TESTING_interpreter_fail (gos->is); return; } - if (0 != strcmp (exchange_url, + if (0 != strcmp (*exchange_url, osr->details.paid.wts[i].exchange_url)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -324,13 +320,11 @@ merchant_get_order_cb ( const struct TALER_Amount *transfer_fee; if ((GNUNET_OK != - TALER_TESTING_get_trait_amount_obj (transfer_cmd, - 0, - &transfer_amount)) || + TALER_TESTING_get_trait_amount (transfer_cmd, + &transfer_amount)) || (GNUNET_OK != - TALER_TESTING_get_trait_amount_obj (transfer_cmd, - 1, - &transfer_fee))) + TALER_TESTING_get_trait_fee (transfer_cmd, + &transfer_fee))) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not fetch wire transfer amount/fee\n"); @@ -387,31 +381,26 @@ merchant_get_order_cb ( gos->is, gos->refunds[i]); { - const char *expected_amount_str; - struct TALER_Amount expected_amount; + const struct TALER_Amount *expected_amount; struct TALER_Amount *amount_found = &osr->details.paid.refunds[i].refund_amount; if (GNUNET_OK != - TALER_TESTING_get_trait_string (refund_cmd, - 0, - &expected_amount_str)) + TALER_TESTING_get_trait_amount (refund_cmd, + &expected_amount)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not fetch refund amount\n"); TALER_TESTING_interpreter_fail (gos->is); return; } - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (expected_amount_str, - &expected_amount)); GNUNET_assert (0 <= TALER_amount_add (&refunded_total, &refunded_total, amount_found)); if ((GNUNET_OK != - TALER_amount_cmp_currency (&expected_amount, + TALER_amount_cmp_currency (expected_amount, &refunded_total)) || - (0 != TALER_amount_cmp (&expected_amount, + (0 != TALER_amount_cmp (expected_amount, &refunded_total))) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -421,11 +410,10 @@ merchant_get_order_cb ( } } { - const char *expected_reason; + const char **expected_reason; if (GNUNET_OK != - TALER_TESTING_get_trait_string (refund_cmd, - 1, + TALER_TESTING_get_trait_reason (refund_cmd, &expected_reason)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -433,7 +421,7 @@ merchant_get_order_cb ( TALER_TESTING_interpreter_fail (gos->is); return; } - if (0 != strcmp (expected_reason, + if (0 != strcmp (*expected_reason, osr->details.paid.refunds[i].reason)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -461,7 +449,7 @@ merchant_get_order_cb ( /* FIXME: Check all of the members of `pud` */ struct TALER_MERCHANT_PayUriData pud; const struct TALER_TESTING_Command *order_cmd; - const char *order_id; + const char **order_id; const struct TALER_ClaimTokenP *claim_token; if (GNUNET_OK != @@ -481,7 +469,6 @@ merchant_get_order_cb ( if (GNUNET_OK != TALER_TESTING_get_trait_order_id (order_cmd, - 0, &order_id)) { TALER_MERCHANT_parse_pay_uri_free (&pud); @@ -490,7 +477,6 @@ merchant_get_order_cb ( if (GNUNET_OK != TALER_TESTING_get_trait_claim_token (order_cmd, - 0, &claim_token)) { TALER_MERCHANT_parse_pay_uri_free (&pud); @@ -519,7 +505,7 @@ merchant_get_order_cb ( if ((0 != strcmp (host, pud.merchant_host)) || (NULL != pud.merchant_prefix_path) || - (0 != strcmp (order_id, + (0 != strcmp (*order_id, pud.order_id)) || (NULL != pud.ssid)) { @@ -527,7 +513,7 @@ merchant_get_order_cb ( "Order pay uri `%s' does not match, wanted %s/%s\n", osr->details.unpaid.taler_pay_uri, host, - order_id); + *order_id); TALER_TESTING_interpreter_fail (gos->is); TALER_MERCHANT_parse_pay_uri_free (&pud); GNUNET_free (host); @@ -581,8 +567,8 @@ merchant_get_order_run (void *cls, { struct MerchantGetOrderState *gos = cls; const struct TALER_TESTING_Command *order_cmd; - const char *order_id; - const struct GNUNET_HashCode *h_contract; + const char **order_id; + const struct TALER_PrivateContractHash *h_contract; order_cmd = TALER_TESTING_interpreter_lookup_command ( is, @@ -590,20 +576,18 @@ merchant_get_order_run (void *cls, if (GNUNET_OK != TALER_TESTING_get_trait_order_id (order_cmd, - 0, &order_id)) TALER_TESTING_FAIL (is); if (GNUNET_OK != TALER_TESTING_get_trait_h_contract_terms (order_cmd, - 0, &h_contract)) TALER_TESTING_FAIL (is); gos->is = is; gos->ogh = TALER_MERCHANT_merchant_order_get (is->ctx, gos->merchant_url, - order_id, + *order_id, NULL, true, GNUNET_TIME_UNIT_ZERO, -- cgit v1.2.3