remove wad fee, kyc fee and kyc-timeout

2 files changed, 0 insertions, 29 deletions

diff --git a/src/util/offline_signatures.c b/src/util/offline_signatures.c
index 108c665ef..b316c8ba7 100644
--- a/src/util/offline_signatures.c
+++ b/src/util/offline_signatures.c
@@ -840,15 +840,6 @@ struct TALER_MasterGlobalFeePS
   struct GNUNET_TIME_RelativeNBO purse_timeout;
 
   /**
-   * How long does the exchange promise to keep funds
-   * an account for which the KYC has never happened
-   * after a purse was merged into an account? Basically,
-   * after this time funds in an account without KYC are
-   * forfeit.
-   */
-  struct GNUNET_TIME_RelativeNBO kyc_timeout;
-
-  /**
    * How long will the exchange preserve the account history?  After an
    * account was deleted/closed, the exchange will retain the account history
    * for legal reasons until this time.
@@ -878,7 +869,6 @@ TALER_exchange_offline_global_fee_sign (
   struct GNUNET_TIME_Timestamp end_time,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterPrivateKeyP *master_priv,
@@ -890,7 +880,6 @@ TALER_exchange_offline_global_fee_sign (
     .start_date = GNUNET_TIME_timestamp_hton (start_time),
     .end_date = GNUNET_TIME_timestamp_hton (end_time),
     .purse_timeout = GNUNET_TIME_relative_hton (purse_timeout),
-    .kyc_timeout = GNUNET_TIME_relative_hton (kyc_timeout),
     .history_expiration = GNUNET_TIME_relative_hton (history_expiration),
     .purse_account_limit = htonl (purse_account_limit)
   };
@@ -909,7 +898,6 @@ TALER_exchange_offline_global_fee_verify (
   struct GNUNET_TIME_Timestamp end_time,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterPublicKeyP *master_pub,
@@ -921,7 +909,6 @@ TALER_exchange_offline_global_fee_verify (
     .start_date = GNUNET_TIME_timestamp_hton (start_time),
     .end_date = GNUNET_TIME_timestamp_hton (end_time),
     .purse_timeout = GNUNET_TIME_relative_hton (purse_timeout),
-    .kyc_timeout = GNUNET_TIME_relative_hton (kyc_timeout),
     .history_expiration = GNUNET_TIME_relative_hton (history_expiration),
     .purse_account_limit = htonl (purse_account_limit)
   };
diff --git a/src/util/util.c b/src/util/util.c
index f715456d8..2b8c9d952 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -82,8 +82,6 @@ TALER_global_fee_set_hton (struct TALER_GlobalFeeSetNBOP *nbo,
 {
   TALER_amount_hton (&nbo->history,
                      &fees->history);
-  TALER_amount_hton (&nbo->kyc,
-                     &fees->kyc);
   TALER_amount_hton (&nbo->account,
                      &fees->account);
   TALER_amount_hton (&nbo->purse,
@@ -97,8 +95,6 @@ TALER_global_fee_set_ntoh (struct TALER_GlobalFeeSet *fees,
 {
   TALER_amount_ntoh (&fees->history,
                      &nbo->history);
-  TALER_amount_ntoh (&fees->kyc,
-                     &nbo->kyc);
   TALER_amount_ntoh (&fees->account,
                      &nbo->account);
   TALER_amount_ntoh (&fees->purse,
@@ -114,8 +110,6 @@ TALER_wire_fee_set_hton (struct TALER_WireFeeSetNBOP *nbo,
                      &fees->wire);
   TALER_amount_hton (&nbo->closing,
                      &fees->closing);
-  TALER_amount_hton (&nbo->wad,
-                     &fees->wad);
 }
 
 
@@ -127,8 +121,6 @@ TALER_wire_fee_set_ntoh (struct TALER_WireFeeSet *fees,
                      &nbo->wire);
   TALER_amount_ntoh (&fees->closing,
                      &nbo->closing);
-  TALER_amount_ntoh (&fees->wad,
-                     &nbo->wad);
 }
 
 
@@ -142,10 +134,6 @@ TALER_global_fee_set_cmp (const struct TALER_GlobalFeeSet *f1,
                           &f2->history);
   if (0 != ret)
     return ret;
-  ret = TALER_amount_cmp (&f1->kyc,
-                          &f2->kyc);
-  if (0 != ret)
-    return ret;
   ret = TALER_amount_cmp (&f1->account,
                           &f2->account);
   if (0 != ret)
@@ -172,10 +160,6 @@ TALER_wire_fee_set_cmp (const struct TALER_WireFeeSet *f1,
                           &f2->closing);
   if (0 != ret)
     return ret;
-  ret = TALER_amount_cmp (&f1->wad,
-                          &f2->wad);
-  if (0 != ret)
-    return ret;
   return 0;
 }