breaking protocol changes towards fixing #7810 (incomplete, taler-exchange-offline still unfinished)

25 files changed, 289 insertions, 257 deletions

diff --git a/src/testing/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c
index 9a61d6d53..119c5d86c 100644
--- a/src/testing/testing_api_cmd_bank_history_credit.c
+++ b/src/testing/testing_api_cmd_bank_history_credit.c
@@ -386,10 +386,10 @@ history_cb (void *cls,
     GNUNET_break (0);
     goto error;
   case MHD_HTTP_OK:
-    for (unsigned int i = 0; i<chr->details.success.details_length; i++)
+    for (unsigned int i = 0; i<chr->details.ok.details_length; i++)
     {
       const struct TALER_BANK_CreditDetails *cd =
-        &chr->details.success.details[i];
+        &chr->details.ok.details[i];
 
       /* check current element */
       if (GNUNET_OK !=
diff --git a/src/testing/testing_api_cmd_bank_history_debit.c b/src/testing/testing_api_cmd_bank_history_debit.c
index 33b212ad0..fd1e81994 100644
--- a/src/testing/testing_api_cmd_bank_history_debit.c
+++ b/src/testing/testing_api_cmd_bank_history_debit.c
@@ -378,10 +378,10 @@ history_cb (void *cls,
     GNUNET_break (0);
     goto error;
   case MHD_HTTP_OK:
-    for (unsigned int i = 0; i<dhr->details.success.details_length; i++)
+    for (unsigned int i = 0; i<dhr->details.ok.details_length; i++)
     {
       const struct TALER_BANK_DebitDetails *dd =
-        &dhr->details.success.details[i];
+        &dhr->details.ok.details[i];
 
       /* check current element */
       if (GNUNET_OK !=
diff --git a/src/testing/testing_api_cmd_batch_deposit.c b/src/testing/testing_api_cmd_batch_deposit.c
index 54a20cdb2..d3275875d 100644
--- a/src/testing/testing_api_cmd_batch_deposit.c
+++ b/src/testing/testing_api_cmd_batch_deposit.c
@@ -212,17 +212,17 @@ batch_deposit_cb (void *cls,
   }
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
-    if (ds->num_coins != dr->details.success.num_signatures)
+    if (ds->num_coins != dr->details.ok.num_signatures)
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (ds->is);
       return;
     }
     ds->deposit_succeeded = GNUNET_YES;
-    ds->exchange_timestamp = dr->details.success.deposit_timestamp;
-    ds->exchange_pub = *dr->details.success.exchange_pub;
-    ds->exchange_sigs = GNUNET_memdup (dr->details.success.exchange_sigs,
-                                       dr->details.success.num_signatures
+    ds->exchange_timestamp = dr->details.ok.deposit_timestamp;
+    ds->exchange_pub = *dr->details.ok.exchange_pub;
+    ds->exchange_sigs = GNUNET_memdup (dr->details.ok.exchange_sigs,
+                                       dr->details.ok.num_signatures
                                        * sizeof (struct
                                                  TALER_ExchangeSignatureP));
   }
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c
index a5229ae9c..2aa549c0f 100644
--- a/src/testing/testing_api_cmd_batch_withdraw.c
+++ b/src/testing/testing_api_cmd_batch_withdraw.c
@@ -210,7 +210,7 @@ reserve_batch_withdraw_cb (void *cls,
     {
       struct CoinState *cs = &ws->coins[i];
       const struct TALER_EXCHANGE_PrivateCoinDetails *pcd
-        = &wr->details.success.coins[i];
+        = &wr->details.ok.coins[i];
 
       TALER_denom_sig_deep_copy (&cs->sig,
                                  &pcd->sig);
diff --git a/src/testing/testing_api_cmd_check_aml_decision.c b/src/testing/testing_api_cmd_check_aml_decision.c
index d77e9b6b9..dd317142b 100644
--- a/src/testing/testing_api_cmd_check_aml_decision.c
+++ b/src/testing/testing_api_cmd_check_aml_decision.c
@@ -116,10 +116,10 @@ check_aml_decision_cb (void *cls,
     GNUNET_assert (GNUNET_OK ==
                    TALER_TESTING_get_trait_amount (ref,
                                                    &amount));
-    for (unsigned int i = 0; i<adr->details.success.aml_history_length; i++)
+    for (unsigned int i = 0; i<adr->details.ok.aml_history_length; i++)
     {
       const struct TALER_EXCHANGE_AmlDecisionDetail *aml_history
-        = &adr->details.success.aml_history[i];
+        = &adr->details.ok.aml_history[i];
 
       if ( (NULL == oldest) ||
            (0 !=
diff --git a/src/testing/testing_api_cmd_contract_get.c b/src/testing/testing_api_cmd_contract_get.c
index 428bf7e8c..d599cb595 100644
--- a/src/testing/testing_api_cmd_contract_get.c
+++ b/src/testing/testing_api_cmd_contract_get.c
@@ -121,7 +121,7 @@ get_cb (void *cls,
     const struct TALER_PurseMergePrivateKeyP *mp;
     const json_t *ct;
 
-    ds->purse_pub = dr->details.success.purse_pub;
+    ds->purse_pub = dr->details.ok.purse_pub;
     if (ds->merge)
     {
       if (GNUNET_OK !=
@@ -136,8 +136,8 @@ get_cb (void *cls,
         TALER_CRYPTO_contract_decrypt_for_merge (
           &ds->contract_priv,
           &ds->purse_pub,
-          dr->details.success.econtract,
-          dr->details.success.econtract_size,
+          dr->details.ok.econtract,
+          dr->details.ok.econtract_size,
           &ds->merge_priv);
       if (0 !=
           GNUNET_memcmp (mp,
@@ -153,8 +153,8 @@ get_cb (void *cls,
       ds->contract_terms =
         TALER_CRYPTO_contract_decrypt_for_deposit (
           &ds->contract_priv,
-          dr->details.success.econtract,
-          dr->details.success.econtract_size);
+          dr->details.ok.econtract,
+          dr->details.ok.econtract_size);
     }
     if (NULL == ds->contract_terms)
     {
diff --git a/src/testing/testing_api_cmd_deposit.c b/src/testing/testing_api_cmd_deposit.c
index 16ac139f4..1b097a346 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -264,9 +264,9 @@ deposit_cb (void *cls,
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
     ds->deposit_succeeded = GNUNET_YES;
-    ds->exchange_timestamp = dr->details.success.deposit_timestamp;
-    ds->exchange_pub = *dr->details.success.exchange_pub;
-    ds->exchange_sig = *dr->details.success.exchange_sig;
+    ds->exchange_timestamp = dr->details.ok.deposit_timestamp;
+    ds->exchange_pub = *dr->details.ok.exchange_pub;
+    ds->exchange_sig = *dr->details.ok.exchange_sig;
   }
   TALER_TESTING_interpreter_next (ds->is);
 }
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c
index 8fd4e813c..8f7970895 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -128,7 +128,7 @@ deposit_wtid_cb (void *cls,
   switch (dr->hr.http_status)
   {
   case MHD_HTTP_OK:
-    tts->wtid = dr->details.success.wtid;
+    tts->wtid = dr->details.ok.wtid;
     if (NULL != tts->bank_transfer_reference)
     {
       const struct TALER_TESTING_Command *bank_transfer_cmd;
@@ -155,7 +155,7 @@ deposit_wtid_cb (void *cls,
       }
 
       /* Compare that expected and gotten subjects match.  */
-      if (0 != GNUNET_memcmp (&dr->details.success.wtid,
+      if (0 != GNUNET_memcmp (&dr->details.ok.wtid,
                               wtid_want))
       {
         GNUNET_break (0);
diff --git a/src/testing/testing_api_cmd_nexus_fetch_transactions.c b/src/testing/testing_api_cmd_nexus_fetch_transactions.c
index 152647963..ff1497f3f 100644
--- a/src/testing/testing_api_cmd_nexus_fetch_transactions.c
+++ b/src/testing/testing_api_cmd_nexus_fetch_transactions.c
@@ -80,6 +80,7 @@ nft_run (void *cls,
                                "wget",
                                "--header=Content-Type:application/json",
                                "--auth-no-challenge",
+                               "--output-file=/dev/null",
                                "--post-data={\"level\":\"all\",\"rangeType\":\"latest\"}",
                                user,
                                pass,
diff --git a/src/testing/testing_api_cmd_purse_create_deposit.c b/src/testing/testing_api_cmd_purse_create_deposit.c
index 200127b77..6fa7d91f9 100644
--- a/src/testing/testing_api_cmd_purse_create_deposit.c
+++ b/src/testing/testing_api_cmd_purse_create_deposit.c
@@ -176,8 +176,8 @@ deposit_cb (void *cls,
   }
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
-    ds->exchange_pub = dr->details.success.exchange_pub;
-    ds->exchange_sig = dr->details.success.exchange_sig;
+    ds->exchange_pub = dr->details.ok.exchange_pub;
+    ds->exchange_sig = dr->details.ok.exchange_sig;
   }
   TALER_TESTING_interpreter_next (ds->is);
 }
diff --git a/src/testing/testing_api_cmd_purse_deposit.c b/src/testing/testing_api_cmd_purse_deposit.c
index ff8e6d2e3..aaf6ff6ba 100644
--- a/src/testing/testing_api_cmd_purse_deposit.c
+++ b/src/testing/testing_api_cmd_purse_deposit.c
@@ -152,8 +152,8 @@ deposit_cb (void *cls,
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
     if (-1 !=
-        TALER_amount_cmp (&dr->details.success.total_deposited,
-                          &dr->details.success.purse_value_after_fees))
+        TALER_amount_cmp (&dr->details.ok.total_deposited,
+                          &dr->details.ok.purse_value_after_fees))
     {
       const struct TALER_TESTING_Command *purse_cmd;
       const struct TALER_ReserveSignatureP *reserve_sig;
@@ -213,7 +213,7 @@ deposit_cb (void *cls,
 
         /* Note: change when flags below changes! */
         ds->reserve_history.amount
-          = dr->details.success.purse_value_after_fees;
+          = dr->details.ok.purse_value_after_fees;
         if (true)
         {
           ds->reserve_history.details.merge_details.purse_fee = gf->fees.purse;
@@ -226,7 +226,7 @@ deposit_cb (void *cls,
         }
       }
       ds->reserve_history.details.merge_details.h_contract_terms
-        = dr->details.success.h_contract_terms;
+        = dr->details.ok.h_contract_terms;
       ds->reserve_history.details.merge_details.merge_pub
         = *merge_pub;
       ds->reserve_history.details.merge_details.purse_pub
@@ -236,7 +236,7 @@ deposit_cb (void *cls,
       ds->reserve_history.details.merge_details.merge_timestamp
         = *merge_timestamp;
       ds->reserve_history.details.merge_details.purse_expiration
-        = dr->details.success.purse_expiration;
+        = dr->details.ok.purse_expiration;
       ds->reserve_history.details.merge_details.min_age
         = ds->min_age;
       ds->reserve_history.details.merge_details.flags
diff --git a/src/testing/testing_api_cmd_purse_get.c b/src/testing/testing_api_cmd_purse_get.c
index 3e7da38f0..60638752f 100644
--- a/src/testing/testing_api_cmd_purse_get.c
+++ b/src/testing/testing_api_cmd_purse_get.c
@@ -147,11 +147,11 @@ purse_status_cb (void *cls,
                    TALER_string_to_amount (ss->expected_balance,
                                            &eb));
     if (0 != TALER_amount_cmp (&eb,
-                               &rs->details.success.balance))
+                               &rs->details.ok.balance))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Unexpected amount in purse: %s\n",
-                  TALER_amount_to_string (&rs->details.success.balance));
+                  TALER_amount_to_string (&rs->details.ok.balance));
       TALER_TESTING_interpreter_fail (ss->is);
       return;
     }
diff --git a/src/testing/testing_api_cmd_recoup.c b/src/testing/testing_api_cmd_recoup.c
index ed8c7eed7..e11475f20 100644
--- a/src/testing/testing_api_cmd_recoup.c
+++ b/src/testing/testing_api_cmd_recoup.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2018 Taler Systems SA
+  Copyright (C) 2014-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
@@ -73,15 +73,14 @@ struct RecoupState
  * was paid back belonged to the right reserve.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param reserve_pub public key of the reserve receiving the recoup
+ * @param rr response details
  */
 static void
 recoup_cb (void *cls,
-           const struct TALER_EXCHANGE_HttpResponse *hr,
-           const struct TALER_ReservePublicKeyP *reserve_pub)
+           const struct TALER_EXCHANGE_RecoupResponse *rr)
 {
   struct RecoupState *ps = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rr->hr;
   struct TALER_TESTING_Interpreter *is = ps->is;
   struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
   const struct TALER_TESTING_Command *reserve_cmd;
@@ -135,12 +134,6 @@ recoup_cb (void *cls,
     {
       const struct TALER_ReservePrivateKeyP *reserve_priv;
 
-      if (NULL == reserve_pub)
-      {
-        GNUNET_break (0);
-        TALER_TESTING_interpreter_fail (is);
-        return;
-      }
       if (GNUNET_OK !=
           TALER_TESTING_get_trait_reserve_priv (reserve_cmd,
                                                 &reserve_priv))
@@ -151,7 +144,7 @@ recoup_cb (void *cls,
       }
       GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                           &ps->reserve_pub.eddsa_pub);
-      if (0 != GNUNET_memcmp (reserve_pub,
+      if (0 != GNUNET_memcmp (&rr->details.ok.reserve_pub,
                               &ps->reserve_pub))
       {
         GNUNET_break (0);
diff --git a/src/testing/testing_api_cmd_recoup_refresh.c b/src/testing/testing_api_cmd_recoup_refresh.c
index 6081a4ba1..ff7dab004 100644
--- a/src/testing/testing_api_cmd_recoup_refresh.c
+++ b/src/testing/testing_api_cmd_recoup_refresh.c
@@ -73,15 +73,14 @@ struct RecoupRefreshState
  * was paid back belonged to the right old coin.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param old_coin_pub public key of the dirty coin
+ * @param rrr response details
  */
 static void
 recoup_refresh_cb (void *cls,
-                   const struct TALER_EXCHANGE_HttpResponse *hr,
-                   const struct TALER_CoinSpendPublicKeyP *old_coin_pub)
+                   const struct TALER_EXCHANGE_RecoupRefreshResponse *rrr)
 {
   struct RecoupRefreshState *rrs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rrr->hr;
   struct TALER_TESTING_Interpreter *is = rrs->is;
   struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
   char *cref;
@@ -150,7 +149,7 @@ recoup_refresh_cb (void *cls,
       GNUNET_CRYPTO_eddsa_key_get_public (&dirty_priv->eddsa_priv,
                                           &oc.eddsa_pub);
       if (0 != GNUNET_memcmp (&oc,
-                              old_coin_pub))
+                              &rrr->details.ok.old_coin_pub))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c
index 2aad77ce3..a8e2e8f39 100644
--- a/src/testing/testing_api_cmd_refresh.c
+++ b/src/testing/testing_api_cmd_refresh.c
@@ -411,7 +411,7 @@ reveal_cb (void *cls,
   switch (hr->http_status)
   {
   case MHD_HTTP_OK:
-    rrs->num_fresh_coins = rr->details.success.num_coins;
+    rrs->num_fresh_coins = rr->details.ok.num_coins;
     rrs->psa = GNUNET_new_array (rrs->num_fresh_coins,
                                  struct TALER_PlanchetMasterSecretP);
     rrs->fresh_coins = GNUNET_new_array (rrs->num_fresh_coins,
@@ -419,7 +419,7 @@ reveal_cb (void *cls,
     for (unsigned int i = 0; i<rrs->num_fresh_coins; i++)
     {
       const struct TALER_EXCHANGE_RevealedCoinInfo *coin
-        = &rr->details.success.coins[i];
+        = &rr->details.ok.coins[i];
       struct TALER_TESTING_FreshCoinData *fc = &rrs->fresh_coins[i];
 
       rrs->psa[i] = coin->ps;
@@ -675,11 +675,11 @@ link_cb (void *cls,
       TALER_TESTING_interpreter_fail (rls->is);
       return;
     }
-    if (lr->details.success.num_coins != *num_fresh_coins)
+    if (lr->details.ok.num_coins != *num_fresh_coins)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Unexpected number of fresh coins: %d vs %d in %s:%u\n",
-                  lr->details.success.num_coins,
+                  lr->details.ok.num_coins,
                   *num_fresh_coins,
                   __FILE__,
                   __LINE__);
@@ -687,11 +687,11 @@ link_cb (void *cls,
       return;
     }
     /* check that the coins match */
-    for (unsigned int i = 0; i<lr->details.success.num_coins; i++)
-      for (unsigned int j = i + 1; j<lr->details.success.num_coins; j++)
+    for (unsigned int i = 0; i<lr->details.ok.num_coins; i++)
+      for (unsigned int j = i + 1; j<lr->details.ok.num_coins; j++)
         if (0 ==
-            GNUNET_memcmp (&lr->details.success.coins[i].coin_priv,
-                           &lr->details.success.coins[j].coin_priv))
+            GNUNET_memcmp (&lr->details.ok.coins[i].coin_priv,
+                           &lr->details.ok.coins[j].coin_priv))
           GNUNET_break (0);
     /* Note: coins might be legitimately permutated in here... */
     found = 0;
@@ -709,12 +709,12 @@ link_cb (void *cls,
         return;
       }
 
-      for (unsigned int i = 0; i<lr->details.success.num_coins; i++)
+      for (unsigned int i = 0; i<lr->details.ok.num_coins; i++)
       {
         const struct TALER_EXCHANGE_LinkedCoinInfo *lci_i
-          = &lr->details.success.coins[i];
+          = &lr->details.ok.coins[i];
 
-        for (unsigned int j = 0; j<lr->details.success.num_coins; j++)
+        for (unsigned int j = 0; j<lr->details.ok.num_coins; j++)
         {
           const struct TALER_TESTING_FreshCoinData *fcj
             = &(*fc)[j];
@@ -735,12 +735,12 @@ link_cb (void *cls,
         } /* for j*/
       } /* for i */
     }
-    if (found != lr->details.success.num_coins)
+    if (found != lr->details.ok.num_coins)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Only %u/%u coins match expectations\n",
                   found,
-                  lr->details.success.num_coins);
+                  lr->details.ok.num_coins);
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (rls->is);
       return;
@@ -952,16 +952,16 @@ melt_cb (void *cls,
   }
   if (MHD_HTTP_OK == hr->http_status)
   {
-    rms->noreveal_index = mr->details.success.noreveal_index;
-    if (mr->details.success.num_mbds != rms->num_fresh_coins)
+    rms->noreveal_index = mr->details.ok.noreveal_index;
+    if (mr->details.ok.num_mbds != rms->num_fresh_coins)
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (rms->is);
       return;
     }
     GNUNET_free (rms->mbds);
-    rms->mbds = GNUNET_memdup (mr->details.success.mbds,
-                               mr->details.success.num_mbds
+    rms->mbds = GNUNET_memdup (mr->details.ok.mbds,
+                               mr->details.ok.num_mbds
                                * sizeof (struct
                                          TALER_EXCHANGE_MeltBlindingDetail));
   }
diff --git a/src/testing/testing_api_cmd_refund.c b/src/testing/testing_api_cmd_refund.c
index 4be3605a4..d41700d1a 100644
--- a/src/testing/testing_api_cmd_refund.c
+++ b/src/testing/testing_api_cmd_refund.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-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
@@ -75,19 +75,14 @@ struct RefundState
  * response code is acceptable.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param exchange_pub public key the exchange
- *        used for signing @a obj.
- * @param exchange_sig actual signature confirming the refund
+ * @param rr response details
  */
 static void
 refund_cb (void *cls,
-           const struct TALER_EXCHANGE_HttpResponse *hr,
-           const struct TALER_ExchangePublicKeyP *exchange_pub,
-           const struct TALER_ExchangeSignatureP *exchange_sig)
+           const struct TALER_EXCHANGE_RefundResponse *rr)
 {
-
   struct RefundState *rs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rr->hr;
   struct TALER_TESTING_Command *refund_cmd;
 
   refund_cmd = &rs->is->commands[rs->is->ip];
diff --git a/src/testing/testing_api_cmd_revoke_denom_key.c b/src/testing/testing_api_cmd_revoke_denom_key.c
index 7c77c3566..8afd4f203 100644
--- a/src/testing/testing_api_cmd_revoke_denom_key.c
+++ b/src/testing/testing_api_cmd_revoke_denom_key.c
@@ -65,14 +65,15 @@ struct RevokeState
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure with a `struct RevokeState *`
- * @param hr HTTP response data
+ * @param rdr response data
  */
 static void
 success_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementRevokeDenominationResponse *rdr)
 {
   struct RevokeState *rs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rdr->hr;
 
   rs->kh = NULL;
   if (rs->expected_response_code != hr->http_status)
diff --git a/src/testing/testing_api_cmd_revoke_sign_key.c b/src/testing/testing_api_cmd_revoke_sign_key.c
index 9745d728d..3b869312a 100644
--- a/src/testing/testing_api_cmd_revoke_sign_key.c
+++ b/src/testing/testing_api_cmd_revoke_sign_key.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-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
@@ -65,14 +65,15 @@ struct RevokeState
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure with a `struct RevokeState *`
- * @param hr HTTP response data
+ * @param rsr response data
  */
 static void
 success_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse *rsr)
 {
   struct RevokeState *rs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rsr->hr;
 
   rs->kh = NULL;
   if (rs->expected_response_code != hr->http_status)
diff --git a/src/testing/testing_api_cmd_set_officer.c b/src/testing/testing_api_cmd_set_officer.c
index 0e6de262f..1c0495f32 100644
--- a/src/testing/testing_api_cmd_set_officer.c
+++ b/src/testing/testing_api_cmd_set_officer.c
@@ -84,13 +84,15 @@ struct SetOfficerState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param ar response details
  */
 static void
 set_officer_cb (void *cls,
-                const struct TALER_EXCHANGE_HttpResponse *hr)
+                const struct
+                TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse *ar)
 {
   struct SetOfficerState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &ar->hr;
 
   ds->dh = NULL;
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
diff --git a/src/testing/testing_api_cmd_transfer_get.c b/src/testing/testing_api_cmd_transfer_get.c
index 3c467e6da..cb6bb7dfa 100644
--- a/src/testing/testing_api_cmd_transfer_get.c
+++ b/src/testing/testing_api_cmd_transfer_get.c
@@ -115,15 +115,14 @@ track_transfer_cleanup (void *cls,
  * wire fees and hashed wire details as well.
  *
  * @param cls closure.
- * @param hr HTTP response details
- * @param ta transfer data returned by the exchange
+ * @param tgr response details
  */
 static void
 track_transfer_cb (void *cls,
-                   const struct TALER_EXCHANGE_HttpResponse *hr,
-                   const struct TALER_EXCHANGE_TransferData *ta)
+                   const struct TALER_EXCHANGE_TransfersGetResponse *tgr)
 {
   struct TrackTransferState *tts = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &tgr->hr;
   struct TALER_TESTING_Interpreter *is = tts->is;
   struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
   struct TALER_Amount expected_amount;
@@ -148,138 +147,62 @@ track_transfer_cb (void *cls,
   switch (hr->http_status)
   {
   case MHD_HTTP_OK:
-    if (NULL == tts->expected_total_amount)
     {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    if (NULL == tts->expected_wire_fee)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
-    if (GNUNET_OK !=
-        TALER_string_to_amount (tts->expected_total_amount,
-                                &expected_amount))
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    if (0 != TALER_amount_cmp (&ta->total_amount,
-                               &expected_amount))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Total amount mismatch to command %s - "
-                  "%s vs %s\n",
-                  cmd->label,
-                  TALER_amount_to_string (&ta->total_amount),
-                  TALER_amount_to_string (&expected_amount));
-      json_dumpf (hr->reply,
-                  stderr,
-                  0);
-      fprintf (stderr, "\n");
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
-    if (GNUNET_OK !=
-        TALER_string_to_amount (tts->expected_wire_fee,
-                                &expected_amount))
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
-    if (0 != TALER_amount_cmp (&ta->wire_fee,
-                               &expected_amount))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Wire fee mismatch to command %s\n",
-                  cmd->label);
-      json_dumpf (hr->reply,
-                  stderr,
-                  0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
+      const struct TALER_EXCHANGE_TransferData *ta
+        = &tgr->details.ok.td;
 
-    /**
-     * Optionally checking: (1) wire-details for this transfer
-     * match the ones from a referenced "deposit" operation -
-     * or any operation that could provide wire-details.  (2)
-     * Total amount for this transfer matches the one from any
-     * referenced command that could provide one.
-     */
-    if (NULL != tts->wire_details_reference)
-    {
-      const struct TALER_TESTING_Command *wire_details_cmd;
-      const char **payto_uri;
-      struct TALER_PaytoHashP h_payto;
-
-      wire_details_cmd
-        = TALER_TESTING_interpreter_lookup_command (is,
-                                                    tts->wire_details_reference);
-      if (NULL == wire_details_cmd)
+      if (NULL == tts->expected_total_amount)
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
+      if (NULL == tts->expected_wire_fee)
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (is);
+        return;
+      }
+
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_payto_uri (wire_details_cmd,
-                                             &payto_uri))
+          TALER_string_to_amount (tts->expected_total_amount,
+                                  &expected_amount))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-      TALER_payto_hash (*payto_uri,
-                        &h_payto);
-      if (0 != GNUNET_memcmp (&h_payto,
-                              &ta->h_payto))
+      if (0 != TALER_amount_cmp (&ta->total_amount,
+                                 &expected_amount))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Wire hash missmath to command %s\n",
-                    cmd->label);
+                    "Total amount mismatch to command %s - "
+                    "%s vs %s\n",
+                    cmd->label,
+                    TALER_amount_to_string (&ta->total_amount),
+                    TALER_amount_to_string (&expected_amount));
         json_dumpf (hr->reply,
                     stderr,
                     0);
+        fprintf (stderr, "\n");
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-    }
-    if (NULL != tts->total_amount_reference)
-    {
-      const struct TALER_TESTING_Command *total_amount_cmd;
-      const struct TALER_Amount *total_amount_from_reference;
 
-      total_amount_cmd
-        = TALER_TESTING_interpreter_lookup_command (is,
-                                                    tts->total_amount_reference);
-      if (NULL == total_amount_cmd)
-      {
-        GNUNET_break (0);
-        TALER_TESTING_interpreter_fail (is);
-        return;
-      }
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_amount (total_amount_cmd,
-                                          &total_amount_from_reference))
+          TALER_string_to_amount (tts->expected_wire_fee,
+                                  &expected_amount))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-      if (0 != TALER_amount_cmp (&ta->total_amount,
-                                 total_amount_from_reference))
+
+      if (0 != TALER_amount_cmp (&ta->wire_fee,
+                                 &expected_amount))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Amount missmath to command %s\n",
+                    "Wire fee mismatch to command %s\n",
                     cmd->label);
         json_dumpf (hr->reply,
                     stderr,
@@ -287,8 +210,92 @@ track_transfer_cb (void *cls,
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-    }
-  }
+
+      /**
+       * Optionally checking: (1) wire-details for this transfer
+       * match the ones from a referenced "deposit" operation -
+       * or any operation that could provide wire-details.  (2)
+       * Total amount for this transfer matches the one from any
+       * referenced command that could provide one.
+       */
+      if (NULL != tts->wire_details_reference)
+      {
+        const struct TALER_TESTING_Command *wire_details_cmd;
+        const char **payto_uri;
+        struct TALER_PaytoHashP h_payto;
+
+        wire_details_cmd
+          = TALER_TESTING_interpreter_lookup_command (is,
+                                                      tts->
+                                                      wire_details_reference);
+        if (NULL == wire_details_cmd)
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        if (GNUNET_OK !=
+            TALER_TESTING_get_trait_payto_uri (wire_details_cmd,
+                                               &payto_uri))
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        TALER_payto_hash (*payto_uri,
+                          &h_payto);
+        if (0 != GNUNET_memcmp (&h_payto,
+                                &ta->h_payto))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Wire hash missmath to command %s\n",
+                      cmd->label);
+          json_dumpf (hr->reply,
+                      stderr,
+                      0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+      }
+      if (NULL != tts->total_amount_reference)
+      {
+        const struct TALER_TESTING_Command *total_amount_cmd;
+        const struct TALER_Amount *total_amount_from_reference;
+
+        total_amount_cmd
+          = TALER_TESTING_interpreter_lookup_command (is,
+                                                      tts->
+                                                      total_amount_reference);
+        if (NULL == total_amount_cmd)
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        if (GNUNET_OK !=
+            TALER_TESTING_get_trait_amount (total_amount_cmd,
+                                            &total_amount_from_reference))
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        if (0 != TALER_amount_cmp (&ta->total_amount,
+                                   total_amount_from_reference))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Amount missmath to command %s\n",
+                      cmd->label);
+          json_dumpf (hr->reply,
+                      stderr,
+                      0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+      }
+      break;
+    } /* case OK */
+  } /* switch on status */
   TALER_TESTING_interpreter_next (is);
 }
 
diff --git a/src/testing/testing_api_cmd_wire.c b/src/testing/testing_api_cmd_wire.c
index 6e44403bc..5fbd41b1e 100644
--- a/src/testing/testing_api_cmd_wire.c
+++ b/src/testing/testing_api_cmd_wire.c
@@ -72,18 +72,14 @@ struct WireState
  * that the wire fee is acceptable too.
  *
  * @param cls closure.
- * @param hr HTTP response details
- * @param accounts_len length of the @a accounts array.
- * @param accounts list of wire accounts of the exchange,
- *        NULL on error.
+ * @param wr response details
  */
 static void
 wire_cb (void *cls,
-         const struct TALER_EXCHANGE_HttpResponse *hr,
-         unsigned int accounts_len,
-         const struct TALER_EXCHANGE_WireAccount *accounts)
+         const struct TALER_EXCHANGE_WireResponse *wr)
 {
   struct WireState *ws = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wr->hr;
   struct TALER_TESTING_Command *cmd = &ws->is->commands[ws->is->ip];
   struct TALER_Amount expected_fee;
 
@@ -100,6 +96,15 @@ wire_cb (void *cls,
 
   if (MHD_HTTP_OK == hr->http_status)
   {
+    unsigned int accounts_len
+      = wr->details.ok.accounts_len;
+    unsigned int fees_len
+      = wr->details.ok.fees_len;
+    const struct TALER_EXCHANGE_WireAccount *accounts
+      = wr->details.ok.accounts;
+    const struct TALER_EXCHANGE_WireFeesByMethod *fees
+      = wr->details.ok.fees;
+
     for (unsigned int i = 0; i<accounts_len; i++)
     {
       char *method;
@@ -115,32 +120,46 @@ wire_cb (void *cls,
                        method))
       {
         ws->method_found = GNUNET_OK;
-        if (NULL != ws->expected_fee)
+      }
+      GNUNET_free (method);
+    }
+    if (NULL != ws->expected_fee)
+    {
+      bool fee_found = false;
+
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_string_to_amount (ws->expected_fee,
+                                             &expected_fee));
+      for (unsigned int i = 0; i<fees_len; i++)
+      {
+        if (0 != strcmp (fees[i].method,
+                         ws->expected_method))
+          continue;
+        for (const struct TALER_EXCHANGE_WireAggregateFees *waf
+               = fees[i].fees_head;
+             NULL != waf;
+             waf = waf->next)
         {
-          GNUNET_assert (GNUNET_OK ==
-                         TALER_string_to_amount (ws->expected_fee,
-                                                 &expected_fee));
-          for (const struct TALER_EXCHANGE_WireAggregateFees *waf
-                 = accounts[i].fees;
-               NULL != waf;
-               waf = waf->next)
+          if (0 != TALER_amount_cmp (&waf->fees.wire,
+                                     &expected_fee))
           {
-            if (0 != TALER_amount_cmp (&waf->fees.wire,
-                                       &expected_fee))
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                          "Wire fee mismatch to command %s\n",
-                          cmd->label);
-              TALER_TESTING_interpreter_fail (ws->is);
-              GNUNET_free (method);
-              return;
-            }
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                        "Wire fee mismatch to command %s\n",
+                        cmd->label);
+            TALER_TESTING_interpreter_fail (ws->is);
+            return;
           }
+          fee_found = true;
         }
       }
-      TALER_LOG_DEBUG ("Freeing method '%s'\n",
-                       method);
-      GNUNET_free (method);
+      if (! fee_found)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "/wire does not contain expected fee '%s'\n",
+                    ws->expected_fee);
+        TALER_TESTING_interpreter_fail (ws->is);
+        return;
+      }
     }
     if (GNUNET_OK != ws->method_found)
     {
diff --git a/src/testing/testing_api_cmd_wire_add.c b/src/testing/testing_api_cmd_wire_add.c
index c07e9bba6..c36f03b15 100644
--- a/src/testing/testing_api_cmd_wire_add.c
+++ b/src/testing/testing_api_cmd_wire_add.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,13 +67,14 @@ struct WireAddState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param wer response details
  */
 static void
 wire_add_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementWireEnableResponse *wer)
 {
   struct WireAddState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wer->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
@@ -110,10 +111,14 @@ wire_add_run (void *cls,
   struct TALER_MasterSignatureP master_sig1;
   struct TALER_MasterSignatureP master_sig2;
   struct GNUNET_TIME_Timestamp now;
+  json_t *credit_rest;
+  json_t *debit_rest;
 
   (void) cmd;
   now = GNUNET_TIME_timestamp_get ();
   ds->is = is;
+  debit_rest = json_array ();
+  credit_rest = json_array ();
   if (ds->bad_sig)
   {
     memset (&master_sig1,
@@ -126,10 +131,16 @@ wire_add_run (void *cls,
   else
   {
     TALER_exchange_offline_wire_add_sign (ds->payto_uri,
+                                          NULL,
+                                          debit_rest,
+                                          credit_rest,
                                           now,
                                           &is->master_priv,
                                           &master_sig1);
     TALER_exchange_wire_signature_make (ds->payto_uri,
+                                        NULL,
+                                        debit_rest,
+                                        credit_rest,
                                         &is->master_priv,
                                         &master_sig2);
   }
@@ -137,11 +148,16 @@ wire_add_run (void *cls,
     is->ctx,
     is->exchange_url,
     ds->payto_uri,
+    NULL,
+    debit_rest,
+    credit_rest,
     now,
     &master_sig1,
     &master_sig2,
     &wire_add_cb,
     ds);
+  json_decref (debit_rest);
+  json_decref (credit_rest);
   if (NULL == ds->dh)
   {
     GNUNET_break (0);
diff --git a/src/testing/testing_api_cmd_wire_del.c b/src/testing/testing_api_cmd_wire_del.c
index 15d29d727..89fb83957 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,13 +67,14 @@ 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)
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c
index 1bd3c187e..8d53f4d07 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -297,10 +297,10 @@ reserve_withdraw_cb (void *cls,
   {
   case MHD_HTTP_OK:
     TALER_denom_sig_deep_copy (&ws->sig,
-                               &wr->details.success.sig);
-    ws->coin_priv = wr->details.success.coin_priv;
-    ws->bks = wr->details.success.bks;
-    ws->exchange_vals = wr->details.success.exchange_vals;
+                               &wr->details.ok.sig);
+    ws->coin_priv = wr->details.ok.coin_priv;
+    ws->bks = wr->details.ok.bks;
+    ws->exchange_vals = wr->details.ok.exchange_vals;
     if (0 != ws->total_backoff.rel_value_us)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c
index 1865a1129..3ac9bea20 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -526,49 +526,46 @@ sighandler_child_death (void)
 
 void
 TALER_TESTING_cert_cb (void *cls,
-                       const struct TALER_EXCHANGE_HttpResponse *hr,
-                       const struct TALER_EXCHANGE_Keys *keys,
-                       enum TALER_EXCHANGE_VersionCompatibility compat)
+                       const struct TALER_EXCHANGE_KeysResponse *kr)
 {
+  const struct TALER_EXCHANGE_HttpResponse *hr = &kr->hr;
   struct MainContext *main_ctx = cls;
   struct TALER_TESTING_Interpreter *is = main_ctx->is;
 
-  (void) compat;
-  if (NULL == keys)
+  switch (hr->http_status)
   {
-    if (GNUNET_NO == is->working)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Got NULL response for /keys during startup (%u/%d), retrying!\n",
-                  hr->http_status,
-                  (int) hr->ec);
-      TALER_EXCHANGE_disconnect (is->exchange);
-      GNUNET_assert (
-        NULL != (is->exchange
-                   = TALER_EXCHANGE_connect (is->ctx,
-                                             main_ctx->exchange_url,
-                                             &TALER_TESTING_cert_cb,
-                                             main_ctx,
-                                             TALER_EXCHANGE_OPTION_END)));
-      return;
-    }
-    else
+  case MHD_HTTP_OK:
+    /* dealt with below */
+    break;
+  default:
+    if (GNUNET_YES == is->working)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Got NULL response for /keys during execution (%u/%d)!\n",
                   hr->http_status,
                   (int) hr->ec);
+      return;
     }
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Got failure response for /keys during startup (%u/%d), retrying!\n",
+                hr->http_status,
+                (int) hr->ec);
+    TALER_EXCHANGE_disconnect (is->exchange);
+    GNUNET_assert (
+      NULL != (is->exchange
+                 = TALER_EXCHANGE_connect (is->ctx,
+                                           main_ctx->exchange_url,
+                                           &TALER_TESTING_cert_cb,
+                                           main_ctx,
+                                           TALER_EXCHANGE_OPTION_END)));
+    return;
   }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Got %d DK from /keys in generation %u\n",
-                keys->num_denom_keys,
-                is->key_generation + 1);
-  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Got %d DK from /keys in generation %u\n",
+              kr->details.ok.keys->num_denom_keys,
+              is->key_generation + 1);
   is->key_generation++;
-  is->keys = keys;
+  is->keys = kr->details.ok.keys;
 
   /* /keys has been called for some reason and
    * the interpreter is already running. */