summaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-11-01 16:43:59 +0100
committerChristian Grothoff <christian@grothoff.org>2022-11-01 16:43:59 +0100
commit481ffc1a0a2c808316877a76d74262aa61274a26 (patch)
treea9d39ddc70f8c7037c8f50919495e567873f8719 /src/exchange
parent22357678a088836aca5cd2c7e78c2c6702b6092c (diff)
downloadexchange-481ffc1a0a2c808316877a76d74262aa61274a26.tar.gz
exchange-481ffc1a0a2c808316877a76d74262aa61274a26.tar.bz2
exchange-481ffc1a0a2c808316877a76d74262aa61274a26.zip
remove wad fee, kyc fee and kyc-timeout
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-httpd_keys.c5
-rw-r--r--src/exchange/taler-exchange-httpd_keys.h5
-rw-r--r--src/exchange/taler-exchange-httpd_management_global_fees.c9
-rw-r--r--src/exchange/taler-exchange-httpd_management_wire_fees.c3
-rw-r--r--src/exchange/taler-exchange-httpd_purses_merge.c7
-rw-r--r--src/exchange/taler-exchange-httpd_wire.c2
6 files changed, 6 insertions, 25 deletions
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index a6ad9976d..9b7f28bd0 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -2426,7 +2426,6 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh)
* @param cls `struct TEH_KeyStateHandle *` we are building
* @param fees the global fees we charge
* @param purse_timeout when do purses time out
- * @param kyc_timeout when do reserves without KYC time out
* @param history_expiration how long are account histories preserved
* @param purse_account_limit how many purses are free per account
* @param start_date from when are these fees valid (start date)
@@ -2439,7 +2438,6 @@ global_fee_info_cb (
void *cls,
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,
struct GNUNET_TIME_Timestamp start_date,
@@ -2457,7 +2455,6 @@ global_fee_info_cb (
gf->end_date = end_date;
gf->fees = *fees;
gf->purse_timeout = purse_timeout;
- gf->kyc_timeout = kyc_timeout;
gf->history_expiration = history_expiration;
gf->purse_account_limit = purse_account_limit;
gf->master_sig = *master_sig;
@@ -2476,8 +2473,6 @@ global_fee_info_cb (
TALER_JSON_PACK_GLOBAL_FEES (fees),
GNUNET_JSON_pack_time_rel ("history_expiration",
history_expiration),
- GNUNET_JSON_pack_time_rel ("account_kyc_timeout",
- kyc_timeout),
GNUNET_JSON_pack_time_rel ("purse_timeout",
purse_timeout),
GNUNET_JSON_pack_uint64 ("purse_account_limit",
diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h
index 6d0cb5b5a..01ba1f951 100644
--- a/src/exchange/taler-exchange-httpd_keys.h
+++ b/src/exchange/taler-exchange-httpd_keys.h
@@ -113,11 +113,6 @@ struct TEH_GlobalFee
struct GNUNET_TIME_Relative purse_timeout;
/**
- * How long do we keep accounts without KYC?
- */
- struct GNUNET_TIME_Relative kyc_timeout;
-
- /**
* What is the longest history we return?
*/
struct GNUNET_TIME_Relative history_expiration;
diff --git a/src/exchange/taler-exchange-httpd_management_global_fees.c b/src/exchange/taler-exchange-httpd_management_global_fees.c
index 37bb40d90..8203ddefb 100644
--- a/src/exchange/taler-exchange-httpd_management_global_fees.c
+++ b/src/exchange/taler-exchange-httpd_management_global_fees.c
@@ -103,7 +103,6 @@ add_fee (void *cls,
enum GNUNET_DB_QueryStatus qs;
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;
@@ -113,7 +112,6 @@ add_fee (void *cls,
afc->end_time,
&fees,
&purse_timeout,
- &kyc_timeout,
&history_expiration,
&purse_account_limit);
if (qs < 0)
@@ -155,7 +153,6 @@ add_fee (void *cls,
afc->end_time,
&afc->fees,
afc->purse_timeout,
- afc->kyc_timeout,
afc->history_expiration,
afc->purse_account_limit,
&afc->master_sig);
@@ -190,9 +187,6 @@ TEH_handler_management_post_global_fees (
TALER_JSON_spec_amount ("history_fee",
TEH_currency,
&afc.fees.history),
- TALER_JSON_spec_amount ("kyc_fee",
- TEH_currency,
- &afc.fees.kyc),
TALER_JSON_spec_amount ("account_fee",
TEH_currency,
&afc.fees.account),
@@ -201,8 +195,6 @@ TEH_handler_management_post_global_fees (
&afc.fees.purse),
GNUNET_JSON_spec_relative_time ("purse_timeout",
&afc.purse_timeout),
- GNUNET_JSON_spec_relative_time ("kyc_timeout",
- &afc.kyc_timeout),
GNUNET_JSON_spec_relative_time ("history_expiration",
&afc.history_expiration),
GNUNET_JSON_spec_uint32 ("purse_account_limit",
@@ -229,7 +221,6 @@ TEH_handler_management_post_global_fees (
afc.end_time,
&afc.fees,
afc.purse_timeout,
- afc.kyc_timeout,
afc.history_expiration,
afc.purse_account_limit,
&TEH_master_public_key,
diff --git a/src/exchange/taler-exchange-httpd_management_wire_fees.c b/src/exchange/taler-exchange-httpd_management_wire_fees.c
index 2a4262131..dcfa87ef5 100644
--- a/src/exchange/taler-exchange-httpd_management_wire_fees.c
+++ b/src/exchange/taler-exchange-httpd_management_wire_fees.c
@@ -170,9 +170,6 @@ TEH_handler_management_post_wire_fees (
TALER_JSON_spec_amount ("closing_fee",
TEH_currency,
&afc.fees.closing),
- TALER_JSON_spec_amount ("wad_fee",
- TEH_currency,
- &afc.fees.wad),
GNUNET_JSON_spec_end ()
};
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c
index 0bb8a1867..cd6f85471 100644
--- a/src/exchange/taler-exchange-httpd_purses_merge.c
+++ b/src/exchange/taler-exchange-httpd_purses_merge.c
@@ -168,15 +168,20 @@ reply_merge_success (struct MHD_Connection *connection,
}
else
{
+#if WAD_NOT_IMPLEMENTED
+ /* FIXME: figure out partner, lookup wad fee by partner! */
if (0 >
TALER_amount_subtract (&merge_amount,
&pcc->target_amount,
- &pcc->wf->wad))
+ &wad_fee))
{
GNUNET_assert (GNUNET_OK ==
TALER_amount_set_zero (TEH_currency,
&merge_amount));
}
+#else
+ merge_amount = pcc->target_amount;
+#endif
}
if (TALER_EC_NONE !=
(ec = TALER_exchange_online_purse_merged_sign (
diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c
index 7e5f0a915..34010462d 100644
--- a/src/exchange/taler-exchange-httpd_wire.c
+++ b/src/exchange/taler-exchange-httpd_wire.c
@@ -322,8 +322,6 @@ add_wire_fee (void *cls,
GNUNET_JSON_PACK (
TALER_JSON_pack_amount ("wire_fee",
&fees->wire),
- TALER_JSON_pack_amount ("wad_fee",
- &fees->wad),
TALER_JSON_pack_amount ("closing_fee",
&fees->closing),
GNUNET_JSON_pack_timestamp ("start_date",