From b98a204562953ee70a70a293bbe669587bc4b889 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 2 May 2016 05:10:40 +0200
Subject: fix #4184

---
 src/exchange-lib/exchange_api_handle.c  | 10 +++++-----
 src/exchange-lib/exchange_api_refresh.c | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/exchange-lib')

diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c
index 47658052d..04508aa34 100644
--- a/src/exchange-lib/exchange_api_handle.c
+++ b/src/exchange-lib/exchange_api_handle.c
@@ -247,7 +247,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
 {
   struct GNUNET_TIME_Absolute valid_from;
   struct GNUNET_TIME_Absolute withdraw_valid_until;
-  struct GNUNET_TIME_Absolute deposit_valid_until;
+  struct GNUNET_TIME_Absolute expire_deposit;
   struct GNUNET_TIME_Absolute expire_legal;
   struct TALER_Amount value;
   struct TALER_Amount fee_withdraw;
@@ -262,7 +262,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
     GNUNET_JSON_spec_fixed_auto ("master_sig",
 				 &sig),
     GNUNET_JSON_spec_absolute_time ("stamp_expire_deposit",
-				    &deposit_valid_until),
+				    &expire_deposit),
     GNUNET_JSON_spec_absolute_time ("stamp_expire_withdraw",
 				    &withdraw_valid_until),
     GNUNET_JSON_spec_absolute_time ("stamp_start",
@@ -302,7 +302,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
   denom_key_issue.master = *master_key;
   denom_key_issue.start = GNUNET_TIME_absolute_hton (valid_from);
   denom_key_issue.expire_withdraw = GNUNET_TIME_absolute_hton (withdraw_valid_until);
-  denom_key_issue.expire_spend = GNUNET_TIME_absolute_hton (deposit_valid_until);
+  denom_key_issue.expire_deposit = GNUNET_TIME_absolute_hton (expire_deposit);
   denom_key_issue.expire_legal = GNUNET_TIME_absolute_hton (expire_legal);
   TALER_amount_hton (&denom_key_issue.value,
                      &value);
@@ -326,7 +326,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
   denom_key->h_key = denom_key_issue.denom_hash;
   denom_key->valid_from = valid_from;
   denom_key->withdraw_valid_until = withdraw_valid_until;
-  denom_key->deposit_valid_until = deposit_valid_until;
+  denom_key->expire_deposit = expire_deposit;
   denom_key->expire_legal = expire_legal;
   denom_key->value = value;
   denom_key->fee_withdraw = fee_withdraw;
@@ -431,7 +431,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
     }
     kv.start = GNUNET_TIME_absolute_hton (dk->valid_from);
     kv.expire_withdraw = GNUNET_TIME_absolute_hton (dk->withdraw_valid_until);
-    kv.expire_spend = GNUNET_TIME_absolute_hton (dk->deposit_valid_until);
+    kv.expire_deposit = GNUNET_TIME_absolute_hton (dk->expire_deposit);
     kv.expire_legal = GNUNET_TIME_absolute_hton (dk->expire_legal);
     TALER_amount_hton (&kv.value,
                        &dk->value);
diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/exchange-lib/exchange_api_refresh.c
index 5fe175672..f112152ca 100644
--- a/src/exchange-lib/exchange_api_refresh.c
+++ b/src/exchange-lib/exchange_api_refresh.c
@@ -73,7 +73,7 @@ struct MeltedCoinP
   /**
    * Timestamp indicating when coins of this denomination become invalid.
    */
-  struct GNUNET_TIME_AbsoluteNBO deposit_valid_until;
+  struct GNUNET_TIME_AbsoluteNBO expire_deposit;
 
   /**
    * Size of the encoded public key that follows.
@@ -189,7 +189,7 @@ struct MeltedCoin
   /**
    * Timestamp indicating when coins of this denomination become invalid.
    */
-  struct GNUNET_TIME_Absolute deposit_valid_until;
+  struct GNUNET_TIME_Absolute expire_deposit;
 
   /**
    * Denomination key of the original coin.
@@ -396,7 +396,7 @@ serialize_melted_coin (const struct MeltedCoin *mc,
                      &mc->original_value);
   for (i=0;i<TALER_CNC_KAPPA;i++)
     mcp.transfer_priv[i] = mc->transfer_priv[i];
-  mcp.deposit_valid_until = GNUNET_TIME_absolute_hton (mc->deposit_valid_until);
+  mcp.expire_deposit = GNUNET_TIME_absolute_hton (mc->expire_deposit);
   mcp.pbuf_size = htons ((uint16_t) pbuf_size);
   mcp.sbuf_size = htons ((uint16_t) sbuf_size);
   memcpy (&buf[off],
@@ -478,7 +478,7 @@ deserialize_melted_coin (struct MeltedCoin *mc,
                      &mcp.original_value);
   for (i=0;i<TALER_CNC_KAPPA;i++)
     mc->transfer_priv[i] = mcp.transfer_priv[i];
-  mc->deposit_valid_until = GNUNET_TIME_absolute_ntoh (mcp.deposit_valid_until);
+  mc->expire_deposit = GNUNET_TIME_absolute_ntoh (mcp.expire_deposit);
   return off;
 }
 
@@ -891,8 +891,8 @@ TALER_EXCHANGE_refresh_prepare (unsigned int num_melts,
       md.melted_coins[i].transfer_priv[j].ecdhe_priv = *tpk;
       GNUNET_free (tpk);
     }
-    md.melted_coins[i].deposit_valid_until
-      = melt_pks[i].deposit_valid_until;
+    md.melted_coins[i].expire_deposit
+      = melt_pks[i].expire_deposit;
     md.melted_coins[i].pub_key.rsa_public_key
       = GNUNET_CRYPTO_rsa_public_key_dup (melt_pks[i].key.rsa_public_key);
     md.melted_coins[i].sig.rsa_signature
-- 
cgit v1.2.3