From a2dde02b64a8ee75c9243632eb45a6ceb9b62dd5 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 7 Jun 2023 23:11:05 +0200
Subject: major libtalertesting API refactoring, including no longer having
 taler-specific logic in the test engine core

---
 src/testing/testing_api_cmd_revoke_sign_key.c | 48 +++++++++++++++++++--------
 1 file changed, 35 insertions(+), 13 deletions(-)

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

diff --git a/src/testing/testing_api_cmd_revoke_sign_key.c b/src/testing/testing_api_cmd_revoke_sign_key.c
index 3b869312a..477ffbe8f 100644
--- a/src/testing/testing_api_cmd_revoke_sign_key.c
+++ b/src/testing/testing_api_cmd_revoke_sign_key.c
@@ -78,16 +78,8 @@ success_cb (
   rs->kh = NULL;
   if (rs->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,
-                rs->is->commands[rs->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rs->is);
+    TALER_TESTING_unexpected_status (rs->is,
+                                     hr->http_status);
     return;
   }
   TALER_TESTING_interpreter_next (rs->is);
@@ -159,7 +151,23 @@ revoke_run (void *cls,
   const struct TALER_TESTING_Command *coin_cmd;
   const struct TALER_ExchangePublicKeyP *exchange_pub;
   struct TALER_MasterSignatureP master_sig;
+  const char *exchange_url;
 
+  {
+    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));
+  }
   rs->is = is;
   /* Get sign pub from trait */
   coin_cmd = TALER_TESTING_interpreter_lookup_command (is,
@@ -186,13 +194,27 @@ revoke_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_signkey_revoke_sign (exchange_pub,
-                                                &is->master_priv,
+                                                master_priv,
                                                 &master_sig);
   }
   rs->kh = TALER_EXCHANGE_management_revoke_signing_key (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     exchange_pub,
     &master_sig,
     &success_cb,
-- 
cgit v1.2.3