-work on FTBFS of src/testing

1 files changed, 27 insertions, 30 deletions

diff --git a/src/testing/testing_api_cmd_get_instance.c b/src/testing/testing_api_cmd_get_instance.c
index 0bd736f1..28f34091 100644
--- a/src/testing/testing_api_cmd_get_instance.c
+++ b/src/testing/testing_api_cmd_get_instance.c
@@ -131,30 +131,29 @@ get_instance_cb (void *cls,
   {
   case MHD_HTTP_OK:
     {
-      const char *name;
+      const char **name;
 
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_string (instance_cmd,
-                                          0,
-                                          &name))
+          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;
       }
     }
     {
-      const struct json_t *address;
+      const json_t *address;
+
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_json (instance_cmd,
-                                        0,
-                                        &address))
+          TALER_TESTING_get_trait_address (instance_cmd,
+                                           &address))
         TALER_TESTING_interpreter_fail (gis->is);
       if (1 != json_equal (details->address,
                            address))
@@ -166,14 +165,14 @@ get_instance_cb (void *cls,
       }
     }
     {
-      const struct json_t *jurisdiction;
+      const struct json_t **jurisdiction;
+
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_json (instance_cmd,
-                                        1,
-                                        &jurisdiction))
+          TALER_TESTING_get_trait_jurisdiction (instance_cmd,
+                                                &jurisdiction))
         TALER_TESTING_interpreter_fail (gis->is);
       if (1 != json_equal (details->jurisdiction,
-                           jurisdiction))
+                           *jurisdiction))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "Instance jurisdiction does not match\n");
@@ -183,10 +182,10 @@ get_instance_cb (void *cls,
     }
     {
       const struct TALER_Amount *default_max_wire_fee;
+
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_amount_obj (instance_cmd,
-                                              0,
-                                              &default_max_wire_fee))
+          TALER_TESTING_get_trait_max_wire_fee (instance_cmd,
+                                                &default_max_wire_fee))
         TALER_TESTING_interpreter_fail (gis->is);
       if ((GNUNET_OK != TALER_amount_cmp_currency (
              details->default_max_wire_fee,
@@ -202,10 +201,11 @@ get_instance_cb (void *cls,
     }
     {
       const uint32_t *default_wire_fee_amortization;
+
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_uint32 (instance_cmd,
-                                          0,
-                                          &default_wire_fee_amortization))
+          TALER_TESTING_get_trait_wire_fee_amortization (instance_cmd,
+                                                         &
+                                                         default_wire_fee_amortization))
         TALER_TESTING_interpreter_fail (gis->is);
       if (details->default_wire_fee_amortization !=
           *default_wire_fee_amortization)
@@ -220,9 +220,8 @@ get_instance_cb (void *cls,
       const struct TALER_Amount *default_max_deposit_fee;
 
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_amount_obj (instance_cmd,
-                                              1,
-                                              &default_max_deposit_fee))
+          TALER_TESTING_get_trait_max_deposit_fee (instance_cmd,
+                                                   &default_max_deposit_fee))
         TALER_TESTING_interpreter_fail (gis->is);
       if ( (GNUNET_OK !=
             TALER_amount_cmp_currency (
@@ -242,9 +241,8 @@ get_instance_cb (void *cls,
       const struct GNUNET_TIME_Relative *default_wire_transfer_delay;
 
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_relative_time (instance_cmd,
-                                                 0,
-                                                 &default_wire_transfer_delay))
+          TALER_TESTING_get_trait_wire_delay (instance_cmd,
+                                              &default_wire_transfer_delay))
         TALER_TESTING_interpreter_fail (gis->is);
       if (details->default_wire_transfer_delay.rel_value_us !=
           default_wire_transfer_delay->rel_value_us)
@@ -258,9 +256,8 @@ get_instance_cb (void *cls,
     {
       const struct GNUNET_TIME_Relative *default_pay_delay;
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_relative_time (instance_cmd,
-                                                 1,
-                                                 &default_pay_delay))
+          TALER_TESTING_get_trait_pay_delay (instance_cmd,
+                                             &default_pay_delay))
         TALER_TESTING_interpreter_fail (gis->is);
       if (details->default_pay_delay.rel_value_us !=
           default_pay_delay->rel_value_us)