From 3ead9d772a6850a7654e7e483ebfce5acac8da86 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 9 Aug 2015 21:25:02 +0200
Subject: [PATCH] move struct TALER_MINTDB_RefreshCommitLinkP  to
 taler_signatures.h

---
 src/include/taler_mintdb_plugin.h   | 27 ---------------------------
 src/include/taler_signatures.h      | 25 +++++++++++++++++++++++++
 src/mint-lib/test_mint_api.c        |  5 ++---
 src/mint/taler-mint-httpd_refresh.c |  3 ---
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index a7a735745..ba83c814a 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -388,33 +388,6 @@ struct TALER_MINTDB_RefreshCommitCoin
 };
 
 
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * @brief For each (old) coin being melted, we have a `struct
- * RefreshCommitLinkP` that allows the user to find the shared secret
- * to decrypt the respective refresh links for the new coins in the
- * `struct TALER_MINTDB_RefreshCommitCoin`.
- */
-struct TALER_MINTDB_RefreshCommitLinkP
-{
-  /**
-   * Transfer public key, used to decrypt the @e shared_secret_enc
-   * in combintation with the corresponding private key of the
-   * coin.
-   */
-  struct TALER_TransferPublicKeyP transfer_pub;
-
-  /**
-   * Encrypted shared secret to decrypt the link.
-   */
-  struct TALER_EncryptedLinkSecretP shared_secret_enc;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-
 /**
  * @brief Linked list of refresh information linked to a coin.
  */
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 402e67fe2..0b05bacef 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -648,6 +648,31 @@ struct TALER_MintKeyValidityPS
 };
 
 
+/**
+ * @brief For each (old) coin being melted, we have a `struct
+ * RefreshCommitLinkP` that allows the user to find the shared secret
+ * to decrypt the respective refresh links for the new coins in the
+ * `struct TALER_MINTDB_RefreshCommitCoin`.
+ *
+ * Part of the construction of the refresh session's hash and
+ * thus of what is signed there.
+ */
+struct TALER_MINTDB_RefreshCommitLinkP
+{
+  /**
+   * Transfer public key, used to decrypt the @e shared_secret_enc
+   * in combintation with the corresponding private key of the
+   * coin.
+   */
+  struct TALER_TransferPublicKeyP transfer_pub;
+
+  /**
+   * Encrypted shared secret to decrypt the link.
+   */
+  struct TALER_EncryptedLinkSecretP shared_secret_enc;
+};
+
+
 GNUNET_NETWORK_STRUCT_END
 
 #endif
diff --git a/src/mint-lib/test_mint_api.c b/src/mint-lib/test_mint_api.c
index fcc5db10d..bae96dfb3 100644
--- a/src/mint-lib/test_mint_api.c
+++ b/src/mint-lib/test_mint_api.c
@@ -1933,15 +1933,14 @@ run (void *cls,
 
     /* Melt the rest of the coin's value (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */
 
-#if TEST_REFRESH
-
-
     { .oc = OC_REFRESH_MELT,
       .label = "refresh-melt-1",
       .expected_response_code = MHD_HTTP_OK,
       .details.refresh_melt.melted_coins = melt_coins_1,
       .details.refresh_melt.fresh_amounts = melt_fresh_amounts_1 },
 
+#if TEST_REFRESH
+
     /* Complete (successful) melt operation, and withdraw the coins */
     { .oc = OC_REFRESH_REVEAL,
       .label = "refresh-reveal-1",
diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c
index eb205ed1d..7bcaa7996 100644
--- a/src/mint/taler-mint-httpd_refresh.c
+++ b/src/mint/taler-mint-httpd_refresh.c
@@ -252,9 +252,6 @@ verify_coin_public_info (struct MHD_Connection *connection,
   body.purpose.size = htonl (sizeof (struct TALER_RefreshMeltCoinAffirmationPS));
   body.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_MELT);
   body.session_hash = *session_hash;
-  fprintf (stderr,
-           "Verifying hash %s\n",
-           GNUNET_h2s (session_hash));
 
   TALER_amount_hton (&body.amount_with_fee,
                      &melt_detail->melt_amount_with_fee);