aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_api_cmd_refund_order.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/testing_api_cmd_refund_order.c')
-rw-r--r--src/testing/testing_api_cmd_refund_order.c35
1 files changed, 10 insertions, 25 deletions
diff --git a/src/testing/testing_api_cmd_refund_order.c b/src/testing/testing_api_cmd_refund_order.c
index cac965c5..7cc71e21 100644
--- a/src/testing/testing_api_cmd_refund_order.c
+++ b/src/testing/testing_api_cmd_refund_order.c
@@ -111,25 +111,9 @@ refund_cb (void *cls,
return;
}
{
- char *port;
char *host;
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (ris->is->cfg,
- "merchant",
- "PORT",
- &port))
- {
- /* How did we get here without a configured port? */
- GNUNET_break (0);
- TALER_TESTING_interpreter_fail (ris->is);
- TALER_MERCHANT_parse_refund_uri_free (&rud);
- return;
- }
- GNUNET_asprintf (&host,
- "localhost:%s",
- port);
- GNUNET_free (port);
+ host = TALER_MERCHANT_TESTING_extract_host (ris->merchant_url);
if ((0 != strcmp (host,
rud.merchant_host)) ||
(NULL != rud.merchant_prefix_path) ||
@@ -181,13 +165,14 @@ refund_increase_run (void *cls,
struct RefundState *ris = cls;
ris->is = is;
- ris->orh = TALER_MERCHANT_post_order_refund (is->ctx,
- ris->merchant_url,
- ris->order_id,
- &ris->refund_amount,
- ris->reason,
- &refund_cb,
- ris);
+ ris->orh = TALER_MERCHANT_post_order_refund (
+ TALER_TESTING_interpreter_get_context (is),
+ ris->merchant_url,
+ ris->order_id,
+ &ris->refund_amount,
+ ris->reason,
+ &refund_cb,
+ ris);
if (NULL == ris->orh)
TALER_TESTING_FAIL (is);
}
@@ -212,7 +197,7 @@ refund_increase_traits (void *cls,
struct RefundState *ris = cls;
struct TALER_TESTING_Trait traits[] = {
TALER_TESTING_make_trait_amount (&ris->refund_amount),
- TALER_TESTING_make_trait_reason (&ris->reason),
+ TALER_TESTING_make_trait_reason (ris->reason),
TALER_TESTING_trait_end ()
};