1 files changed, 13 insertions, 21 deletions

diff --git a/src/testing/testing_api_cmd_truth_challenge.c b/src/testing/testing_api_cmd_truth_challenge.c
index f1384c4..7132fcd 100644
--- a/src/testing/testing_api_cmd_truth_challenge.c
+++ b/src/testing/testing_api_cmd_truth_challenge.c
@@ -100,14 +100,8 @@ truth_challenge_cb (void *cls,
   ksls->tco = NULL;
   if (tcd->http_status != ksls->expected_http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                tcd->http_status,
-                ksls->is->commands[ksls->is->ip].label,
-                __FILE__,
-                __LINE__);
-    TALER_TESTING_interpreter_fail (ksls->is);
-    return;
+    TALER_TESTING_unexpected_status (ksls->is,
+                                     tcd->http_status);
   }
   switch (tcd->http_status)
   {
@@ -268,13 +262,14 @@ truth_challenge_run (void *cls,
     payment_secret = NULL;
   }
 
-  ksls->tco = ANASTASIS_truth_challenge (is->ctx,
-                                         ksls->anastasis_url,
-                                         truth_uuid,
-                                         truth_key,
-                                         payment_secret,
-                                         &truth_challenge_cb,
-                                         ksls);
+  ksls->tco = ANASTASIS_truth_challenge (
+    TALER_TESTING_interpreter_get_context (is),
+    ksls->anastasis_url,
+    truth_uuid,
+    truth_key,
+    payment_secret,
+    &truth_challenge_cb,
+    ksls);
   if (NULL == ksls->tco)
   {
     GNUNET_break (0);
@@ -325,12 +320,9 @@ truth_challenge_traits (void *cls,
   struct TALER_TESTING_Trait traits[] = {
     ANASTASIS_TESTING_make_trait_payment_secret (
       &ksls->payment_secret_response),
-    TALER_TESTING_make_trait_payto_uri (
-      (const char **) ksls->pay_uri),
-    TALER_TESTING_make_trait_order_id (
-      (const char **) &ksls->order_id),
-    ANASTASIS_TESTING_make_trait_code (
-      (const char **) &ksls->code),
+    TALER_TESTING_make_trait_payto_uri (ksls->pay_uri),
+    TALER_TESTING_make_trait_order_id (ksls->order_id),
+    ANASTASIS_TESTING_make_trait_code (ksls->code),
     TALER_TESTING_trait_end ()
   };