diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-01 18:57:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-01 18:57:30 +0200 |
commit | 41bbc3b3d8cf2ac9d90cd41b584aea8dac11a9e5 (patch) | |
tree | f447f94f018dff506a3c5a1f6042df3964520c1a /src/testing/testing_api_cmd_merchant_get_order.c | |
parent | 1dede2835d0b7305794a68cd6cc6740e4d05d4e9 (diff) | |
download | merchant-41bbc3b3d8cf2ac9d90cd41b584aea8dac11a9e5.tar.gz merchant-41bbc3b3d8cf2ac9d90cd41b584aea8dac11a9e5.tar.bz2 merchant-41bbc3b3d8cf2ac9d90cd41b584aea8dac11a9e5.zip |
-more json_pack fixes
Diffstat (limited to 'src/testing/testing_api_cmd_merchant_get_order.c')
-rw-r--r-- | src/testing/testing_api_cmd_merchant_get_order.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c index 8862c3ec..26dd0399 100644 --- a/src/testing/testing_api_cmd_merchant_get_order.c +++ b/src/testing/testing_api_cmd_merchant_get_order.c @@ -466,7 +466,8 @@ merchant_get_order_cb ( &pud)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Taler pay uri is malformed\n"); + "Taler pay uri `%s' is malformed\n", + osr->details.unpaid.taler_pay_uri); TALER_TESTING_interpreter_fail (gos->is); return; } @@ -520,9 +521,10 @@ merchant_get_order_cb ( (NULL != pud.ssid)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Order pay uri does not match, got %s/%s\n", - pud.merchant_host, - pud.order_id); + "Order pay uri `%s' does not match, wanted %s/%s\n", + osr->details.unpaid.taler_pay_uri, + host, + order_id); TALER_TESTING_interpreter_fail (gos->is); TALER_MERCHANT_parse_pay_uri_free (&pud); GNUNET_free (host); @@ -532,13 +534,19 @@ merchant_get_order_cb ( } /* The claim token is not given in the pay uri if the order has been claimed already. */ - if ((NULL != pud.claim_token) && - ((NULL == claim_token) || - (0 != GNUNET_memcmp (claim_token, - pud.claim_token)))) + if ( (NULL != pud.claim_token) && + ( (NULL == claim_token) || + (0 != GNUNET_memcmp (claim_token, + pud.claim_token)) ) ) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Order pay uri does not match\n"); + "Order pay uri claim token does not match (%d/%d/%d/%d)\n", + NULL == pud.claim_token, + NULL == claim_token, + (NULL != pud.claim_token) && + GNUNET_is_zero (pud.claim_token), + (NULL != claim_token) && + GNUNET_is_zero (claim_token)); TALER_TESTING_interpreter_fail (gos->is); TALER_MERCHANT_parse_pay_uri_free (&pud); return; |