1 files changed, 47 insertions, 32 deletions

diff --git a/src/testing/testing_api_cmd_recoup.c b/src/testing/testing_api_cmd_recoup.c
index ed8c7eed7..cefcd96bb 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
@@ -59,6 +59,16 @@ struct RecoupState
   struct TALER_ReservePublicKeyP reserve_pub;
 
   /**
+   * Entry in the coin's history generated by this operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
+  /**
+   * Public key of the refunded coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin;
+
+  /**
    * Reserve history entry, set if this recoup actually filled up a reserve.
    * Otherwise `reserve_history.type` will be zero.
    */
@@ -73,17 +83,15 @@ 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;
   char *cref;
   unsigned int idx;
@@ -91,18 +99,9 @@ recoup_cb (void *cls,
   ps->ph = NULL;
   if (ps->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    fprintf (stderr, "\n");
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     hr->http_status,
+                                     ps->expected_response_code);
     return;
   }
 
@@ -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);
@@ -162,6 +155,7 @@ recoup_cb (void *cls,
           TALER_amount_is_valid (&ps->reserve_history.amount))
         ps->reserve_history.type = TALER_EXCHANGE_RTT_RECOUP;
       /* ps->reserve_history.details.recoup_details.coin_pub; // initialized earlier */
+      ps->che.details.recoup.reserve_pub = ps->reserve_pub;
     }
     break;
   case MHD_HTTP_NOT_FOUND:
@@ -200,6 +194,7 @@ recoup_run (void *cls,
   char *cref;
   unsigned int idx;
   const struct TALER_ExchangeWithdrawValues *ewv;
+  struct TALER_DenominationHashP h_denom_pub;
 
   ps->is = is;
   if (GNUNET_OK !=
@@ -231,6 +226,8 @@ recoup_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
+  GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                      &ps->coin.eddsa_pub);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_exchange_wd_value (coin_cmd,
                                                  idx,
@@ -273,13 +270,27 @@ recoup_run (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Trying to recoup denomination '%s'\n",
               TALER_B2S (&denom_pub->h_key));
-  ps->ph = TALER_EXCHANGE_recoup (is->exchange,
-                                  denom_pub,
-                                  coin_sig,
-                                  ewv,
-                                  planchet,
-                                  &recoup_cb,
-                                  ps);
+  ps->che.type = TALER_EXCHANGE_CTT_RECOUP;
+  ps->che.amount = ps->reserve_history.amount;
+  TALER_planchet_blinding_secret_create (planchet,
+                                         ewv,
+                                         &ps->che.details.recoup.coin_bks);
+  TALER_denom_pub_hash (&denom_pub->key,
+                        &h_denom_pub);
+  TALER_wallet_recoup_sign (&h_denom_pub,
+                            &ps->che.details.recoup.coin_bks,
+                            coin_priv,
+                            &ps->che.details.recoup.coin_sig);
+  ps->ph = TALER_EXCHANGE_recoup (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    denom_pub,
+    coin_sig,
+    ewv,
+    planchet,
+    &recoup_cb,
+    ps);
   GNUNET_assert (NULL != ps->ph);
 }
 
@@ -330,6 +341,10 @@ recoup_traits (void *cls,
       TALER_TESTING_make_trait_reserve_pub (&ps->reserve_pub),
       TALER_TESTING_make_trait_reserve_history (0,
                                                 &ps->reserve_history),
+      TALER_TESTING_make_trait_coin_history (0,
+                                             &ps->che),
+      TALER_TESTING_make_trait_coin_pub (0,
+                                         &ps->coin),
       TALER_TESTING_trait_end ()
     };