1 files changed, 46 insertions, 45 deletions

diff --git a/src/testing/testing_api_cmd_wire_del.c b/src/testing/testing_api_cmd_wire_del.c
index 2a1c9e455..50ebfc7cb 100644
--- a/src/testing/testing_api_cmd_wire_del.c
+++ b/src/testing/testing_api_cmd_wire_del.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020, 2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
@@ -67,27 +67,22 @@ struct WireDelState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param wdr response details
  */
 static void
 wire_del_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementWireDisableResponse *wdr)
 {
   struct WireDelState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wdr->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
+
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -108,11 +103,26 @@ wire_del_run (void *cls,
 {
   struct WireDelState *ds = cls;
   struct TALER_MasterSignatureP master_sig;
-  struct GNUNET_TIME_Absolute now;
+  struct GNUNET_TIME_Timestamp now;
+  const char *exchange_url;
 
   (void) cmd;
-  now = GNUNET_TIME_absolute_get ();
-  (void) GNUNET_TIME_round_abs (&now);
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
+  now = GNUNET_TIME_timestamp_get ();
   ds->is = is;
   if (ds->bad_sig)
   {
@@ -122,14 +132,28 @@ wire_del_run (void *cls,
   }
   else
   {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
     TALER_exchange_offline_wire_del_sign (ds->payto_uri,
                                           now,
-                                          &is->master_priv,
+                                          master_priv,
                                           &master_sig);
   }
   ds->dh = TALER_EXCHANGE_management_disable_wire (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     ds->payto_uri,
     now,
     &master_sig,
@@ -159,10 +183,8 @@ wire_del_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_management_disable_wire_cancel (ds->dh);
     ds->dh = NULL;
   }
@@ -170,26 +192,6 @@ wire_del_cleanup (void *cls,
 }
 
 
-/**
- * Offer internal data from a "wire_del" CMD, to other commands.
- *
- * @param cls closure.
- * @param[out] ret result.
- * @param trait name of the trait.
- * @param index index number of the object to offer.
- *
- * @return #GNUNET_OK on success.
- */
-static int
-wire_del_traits (void *cls,
-                 const void **ret,
-                 const char *trait,
-                 unsigned int index)
-{
-  return GNUNET_NO;
-}
-
-
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_wire_del (const char *label,
                             const char *payto_uri,
@@ -207,8 +209,7 @@ TALER_TESTING_cmd_wire_del (const char *label,
       .cls = ds,
       .label = label,
       .run = &wire_del_run,
-      .cleanup = &wire_del_cleanup,
-      .traits = &wire_del_traits
+      .cleanup = &wire_del_cleanup
     };
 
     return cmd;