[GNUnet-SVN] [taler-exchange] branch master updated: fix stupid ordering issue after refactoring

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 6b4313d  fix stupid ordering issue after refactoring
6b4313d is described below

commit 6b4313da618a164cbb68932fc6ccfe40ab5bfc62
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Oct 31 22:59:34 2017 +0100

    fix stupid ordering issue after refactoring
---
 src/exchange-lib/exchange_api_reserve.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/exchange-lib/exchange_api_reserve.c 
b/src/exchange-lib/exchange_api_reserve.c
index c0f7721..35fd0e0 100644
--- a/src/exchange-lib/exchange_api_reserve.c
+++ b/src/exchange-lib/exchange_api_reserve.c
@@ -925,7 +925,7 @@ handle_reserve_withdraw_finished (void *cls,
        check the signatures in the history... */
     if (GNUNET_OK !=
         reserve_withdraw_payment_required (wsh,
-                                        json))
+                                           json))
     {
       GNUNET_break_op (0);
       response_code = 0;
@@ -1075,15 +1075,12 @@ TALER_EXCHANGE_reserve_withdraw (struct 
TALER_EXCHANGE_Handle *exchange,
                                  void *res_cb_cls)
 {
   struct TALER_Amount amount_with_fee;
-  struct TALER_ReservePublicKeyP reserve_pub;
   struct TALER_ReserveSignatureP reserve_sig;
   struct TALER_WithdrawRequestPS req;
   struct TALER_PlanchetDetail pd;
   struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh;
 
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
-                                      &reserve_pub.eddsa_pub);
-  GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                       &req.reserve_pub.eddsa_pub);
   req.purpose.size = htonl (sizeof (struct TALER_WithdrawRequestPS));
   req.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW);
@@ -1100,7 +1097,6 @@ TALER_EXCHANGE_reserve_withdraw (struct 
TALER_EXCHANGE_Handle *exchange,
                      &amount_with_fee);
   TALER_amount_hton (&req.withdraw_fee,
                      &pk->fee_withdraw);
-  req.h_denomination_pub = pd.denom_pub_hash;
   if (GNUNET_OK !=
       TALER_planchet_prepare (&pk->key,
                               ps,
@@ -1109,6 +1105,7 @@ TALER_EXCHANGE_reserve_withdraw (struct 
TALER_EXCHANGE_Handle *exchange,
     GNUNET_break_op (0);
     return NULL;
   }
+  req.h_denomination_pub = pd.denom_pub_hash;
   GNUNET_CRYPTO_hash (pd.coin_ev,
                       pd.coin_ev_size,
                       &req.h_coin_envelope);

-- 
To stop receiving notification emails like this one, please contact
address@hidden