-minor API clean up

3 files changed, 35 insertions, 26 deletions

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index fe5c74618..ca5f2ae8f 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1387,6 +1387,36 @@ struct TALER_EXCHANGE_WithdrawHandle;
 
 
 /**
+ * All the details about a coin that are generated during withdrawal and that
+ * may be needed for future operations on the coin.
+ */
+struct TALER_EXCHANGE_PrivateCoinDetails
+{
+  /**
+   * Private key of the coin.
+   */
+  struct TALER_CoinSpendPrivateKeyP coin_priv;
+
+  /**
+   * Value used to blind the key for the signature.
+   * Needed for recoup operations.
+   */
+  union TALER_DenominationBlindingKeyP bks;
+
+  /**
+   * Signature over the coin.
+   */
+  struct TALER_DenominationSignature sig;
+
+  /**
+   * Values contributed from the exchange during the
+   * withdraw protocol.
+   */
+  struct TALER_ExchangeWithdrawValues exchange_vals;
+};
+
+
+/**
  * Details about a response for a withdraw request.
  */
 struct TALER_EXCHANGE_WithdrawResponse
@@ -1404,30 +1434,7 @@ struct TALER_EXCHANGE_WithdrawResponse
     /**
      * Details if the status is #MHD_HTTP_OK.
      */
-    struct
-    {
-      /**
-       * Private key of the coin.
-       */
-      struct TALER_CoinSpendPrivateKeyP coin_priv;
-
-      /**
-       * Value used to blind the key for the signature.
-       * Needed for recoup operations.
-       */
-      union TALER_DenominationBlindingKeyP bks;
-
-      /**
-       * Signature over the coin.
-       */
-      struct TALER_DenominationSignature sig;
-
-      /**
-       * Values contributed from the exchange during the
-       * withdraw protocol.
-       */
-      struct TALER_ExchangeWithdrawValues exchange_vals;
-    } success;
+    struct TALER_EXCHANGE_PrivateCoinDetails success;
 
     /**
      * Details if the status is #MHD_HTTP_ACCEPTED.
diff --git a/src/testing/.gitignore b/src/testing/.gitignore
index fbc863f6b..71fe5c474 100644
--- a/src/testing/.gitignore
+++ b/src/testing/.gitignore
@@ -42,3 +42,5 @@ test_kyc_api
 test_helper_cs_home/
 test_helper_rsa_home/test_exchange_api_twisted-cs
 test_exchange_api_twisted-rsa
+test_exchange_api_twisted_cs
+test_exchange_api_twisted_rsa
diff --git a/src/testing/testing_api_cmd_recoup_refresh.c b/src/testing/testing_api_cmd_recoup_refresh.c
index 2f8917b2d..1102fc757 100644
--- a/src/testing/testing_api_cmd_recoup_refresh.c
+++ b/src/testing/testing_api_cmd_recoup_refresh.c
@@ -234,8 +234,8 @@ recoup_refresh_run (void *cls,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv;
   const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
   const struct TALER_DenominationSignature *coin_sig;
-  const struct TALER_PlanchetSecretsP *rplanchet;
-  const struct TALER_PlanchetSecretsP *planchet;
+  const struct TALER_RefreshMasterSecretP *rplanchet;
+  const struct TALER_PlanchetMasterSecretP *planchet;
   const struct TALER_ExchangeWithdrawValues *ewv;
   char *cref;
   unsigned int idx;