From 9e3f4bdd791f87df25cfd2b818c7ef385b78b35d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 24 Jul 2019 11:57:03 +0200
Subject: getting revocation/payback test with refreshed coins to pass

---
 src/lib/exchange_api_refresh.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/lib/exchange_api_refresh.c')

diff --git a/src/lib/exchange_api_refresh.c b/src/lib/exchange_api_refresh.c
index c12fd32db..617eab393 100644
--- a/src/lib/exchange_api_refresh.c
+++ b/src/lib/exchange_api_refresh.c
@@ -1518,11 +1518,11 @@ handle_refresh_reveal_finished (void *cls,
  */
 struct TALER_EXCHANGE_RefreshRevealHandle *
 TALER_EXCHANGE_refresh_reveal (struct TALER_EXCHANGE_Handle *exchange,
-			       size_t refresh_data_length,
-			       const char *refresh_data,
-			       uint32_t noreveal_index,
-			       TALER_EXCHANGE_RefreshRevealCallback reveal_cb,
-			       void *reveal_cb_cls)
+                               size_t refresh_data_length,
+                               const char *refresh_data,
+                               uint32_t noreveal_index,
+                               TALER_EXCHANGE_RefreshRevealCallback reveal_cb,
+                               void *reveal_cb_cls)
 {
   struct TALER_EXCHANGE_RefreshRevealHandle *rrh;
   json_t *transfer_privs;
@@ -1535,15 +1535,6 @@ TALER_EXCHANGE_refresh_reveal (struct TALER_EXCHANGE_Handle *exchange,
   struct MeltData *md;
   struct TALER_TransferPublicKeyP transfer_pub;
 
-  GNUNET_assert (GNUNET_YES ==
-		 TEAH_handle_is_ready (exchange));
-  md = deserialize_melt_data (refresh_data,
-                              refresh_data_length);
-  if (NULL == md)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   if (noreveal_index >= TALER_CNC_KAPPA)
   {
     /* We check this here, as it would be really bad to below just
@@ -1553,6 +1544,19 @@ TALER_EXCHANGE_refresh_reveal (struct TALER_EXCHANGE_Handle *exchange,
     GNUNET_break (0);
     return NULL;
   }
+  if (GNUNET_YES !=
+      TEAH_handle_is_ready (exchange))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  md = deserialize_melt_data (refresh_data,
+                              refresh_data_length);
+  if (NULL == md)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
 
   /* now transfer_pub */
   GNUNET_CRYPTO_ecdhe_key_get_public (&md->melted_coin.transfer_priv[noreveal_index].ecdhe_priv,
-- 
cgit v1.2.3