major libtalertesting API refactoring, including no longer having taler-specific logic in the test engine core

1 files changed, 14 insertions, 12 deletions

diff --git a/src/testing/testing_api_cmd_get_instance.c b/src/testing/testing_api_cmd_get_instance.c
index 4491e8b8..1df08348 100644
--- a/src/testing/testing_api_cmd_get_instance.c
+++ b/src/testing/testing_api_cmd_get_instance.c
@@ -187,19 +187,19 @@ get_instance_cb (void *cls,
         dst->active = src->active;
       }
       {
-        const char **name;
+        const char *name;
 
         if (GNUNET_OK !=
             TALER_TESTING_get_trait_instance_name (instance_cmd,
                                                    &name))
           TALER_TESTING_interpreter_fail (gis->is);
         if (0 != strcmp (details->name,
-                         *name))
+                         name))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Instance name does not match: Got `%s', wanted `%s'\n",
                       details->name,
-                      *name);
+                      name);
           TALER_TESTING_interpreter_fail (gis->is);
           return;
         }
@@ -221,7 +221,7 @@ get_instance_cb (void *cls,
         }
       }
       {
-        const struct json_t *jurisdiction;
+        const json_t *jurisdiction;
 
         if (GNUNET_OK !=
             TALER_TESTING_get_trait_jurisdiction (instance_cmd,
@@ -312,6 +312,7 @@ get_instance_cb (void *cls,
       }
       {
         const struct GNUNET_TIME_Relative *default_pay_delay;
+
         if (GNUNET_OK !=
             TALER_TESTING_get_trait_pay_delay (instance_cmd,
                                                &default_pay_delay))
@@ -415,11 +416,12 @@ get_instance_run (void *cls,
   struct GetInstanceState *gis = cls;
 
   gis->is = is;
-  gis->igh = TALER_MERCHANT_instance_get (is->ctx,
-                                          gis->merchant_url,
-                                          gis->instance_id,
-                                          &get_instance_cb,
-                                          gis);
+  gis->igh = TALER_MERCHANT_instance_get (
+    TALER_TESTING_interpreter_get_context (is),
+    gis->merchant_url,
+    gis->instance_id,
+    &get_instance_cb,
+    gis);
   GNUNET_assert (NULL != gis->igh);
 }
 
@@ -476,13 +478,13 @@ get_instance_traits (void *cls,
   if (index < pps->accounts_length)
   {
     struct TALER_TESTING_Trait traits[] = {
-      TALER_TESTING_make_trait_merchant_base_url (&pps->merchant_url),
+      TALER_TESTING_make_trait_merchant_base_url (pps->merchant_url),
       TALER_TESTING_make_trait_h_wires (
         index,
         &pps->accounts[index].h_wire),
       TALER_TESTING_make_trait_payto_uris (
         index,
-        (const char **) &pps->accounts[index].payto_uri),
+        pps->accounts[index].payto_uri),
       TALER_TESTING_trait_end (),
     };
 
@@ -494,7 +496,7 @@ get_instance_traits (void *cls,
   else
   {
     struct TALER_TESTING_Trait traits[] = {
-      TALER_TESTING_make_trait_merchant_base_url (&pps->merchant_url),
+      TALER_TESTING_make_trait_merchant_base_url (pps->merchant_url),
       TALER_TESTING_trait_end (),
     };