From ca87a98695221ea3b8beb08c40cf04f6afe7bd2c Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 28 Oct 2021 20:35:16 +0200
Subject: -work on FTBFS of src/testing

---
 src/testing/testing_api_cmd_get_transfers.c | 36 +++++++++++++----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

(limited to 'src/testing/testing_api_cmd_get_transfers.c')

diff --git a/src/testing/testing_api_cmd_get_transfers.c b/src/testing/testing_api_cmd_get_transfers.c
index e82e6436..5b2907c1 100644
--- a/src/testing/testing_api_cmd_get_transfers.c
+++ b/src/testing/testing_api_cmd_get_transfers.c
@@ -137,7 +137,6 @@ get_transfers_cb (
 
         if (GNUNET_OK !=
             TALER_TESTING_get_trait_wtid (transfer_cmd,
-                                          0,
                                           &wtid))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -158,24 +157,23 @@ get_transfers_cb (
           transfers[i].credit_serial);
       }
       {
-        const char *payto_uri;
+        const char **payto_uri;
 
         if (GNUNET_OK !=
-            TALER_TESTING_get_trait_string (transfer_cmd,
-                                            0,
-                                            &payto_uri))
+            TALER_TESTING_get_trait_payto_uri (transfer_cmd,
+                                               &payto_uri))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Could not fetch wire transfer payto uri\n");
           TALER_TESTING_interpreter_fail (gts->is);
           return;
         }
-        if (0 != strcmp (payto_uri,
+        if (0 != strcmp (*payto_uri,
                          transfers[i].payto_uri))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Wire transfer payto uri does not match: %s != %s\n",
-                      payto_uri,
+                      *payto_uri,
                       transfers[i].payto_uri);
           TALER_TESTING_interpreter_fail (gts->is);
           return;
@@ -185,20 +183,19 @@ get_transfers_cb (
         const struct TALER_Amount *credit_amount;
 
         if (GNUNET_OK !=
-            TALER_TESTING_get_trait_amount_obj (transfer_cmd,
-                                                0,
-                                                &credit_amount))
+            TALER_TESTING_get_trait_amount (transfer_cmd,
+                                            &credit_amount))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Could not fetch wire transfer credit amount\n");
           TALER_TESTING_interpreter_fail (gts->is);
           return;
         }
-        if ((GNUNET_OK != TALER_amount_cmp_currency (credit_amount,
-                                                     &transfers[i].credit_amount))
-            ||
-            (0 != TALER_amount_cmp (credit_amount,
-                                    &transfers[i].credit_amount)))
+        if ( (GNUNET_OK !=
+              TALER_amount_cmp_currency (credit_amount,
+                                         &transfers[i].credit_amount)) ||
+             (0 != TALER_amount_cmp (credit_amount,
+                                     &transfers[i].credit_amount)))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Wire transfer credit amount does not match\n");
@@ -207,19 +204,18 @@ get_transfers_cb (
         }
       }
       {
-        const char *exchange_url;
+        const char **exchange_url;
 
         if (GNUNET_OK !=
-            TALER_TESTING_get_trait_string (transfer_cmd,
-                                            1,
-                                            &exchange_url))
+            TALER_TESTING_get_trait_exchange_url (transfer_cmd,
+                                                  &exchange_url))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                       "Could not fetch wire transfer exchange url\n");
           TALER_TESTING_interpreter_fail (gts->is);
           return;
         }
-        if (0 != strcmp (exchange_url,
+        if (0 != strcmp (*exchange_url,
                          transfers[i].exchange_url))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-- 
cgit v1.2.3