aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/taler_crypto_lib.h49
-rw-r--r--src/include/taler_exchange_service.h7
-rw-r--r--src/include/taler_exchangedb_plugin.h9
-rw-r--r--src/include/taler_json_lib.h2
-rw-r--r--src/include/taler_testing_lib.h10
5 files changed, 9 insertions, 68 deletions
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 2e85f6d9..73b92fe8 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -792,12 +792,6 @@ struct TALER_WireFeeSetNBOP
*/
struct TALER_AmountNBO closing;
- /**
- * The fee the exchange charges for cross-exchange
- * P2P payments.
- */
- struct TALER_AmountNBO wad;
-
};
@@ -809,28 +803,20 @@ struct TALER_GlobalFeeSetNBOP
{
/**
- * The fee the exchange charges for returning the
- * history of a reserve or account.
+ * The fee the exchange charges for returning the history of a reserve or
+ * account.
*/
struct TALER_AmountNBO history;
/**
- * The fee the exchange charges for performing a
- * KYC check on a reserve to turn it into an account
- * that can be used for P2P payments.
- */
- struct TALER_AmountNBO kyc;
-
- /**
- * The fee the exchange charges for keeping
- * an account or reserve open for a year.
+ * The fee the exchange charges for keeping an account or reserve open for a
+ * year.
*/
struct TALER_AmountNBO account;
/**
- * The fee the exchange charges if a purse
- * is abandoned and this was not covered by
- * the account limit.
+ * The fee the exchange charges if a purse is abandoned and this was not
+ * covered by the account limit.
*/
struct TALER_AmountNBO purse;
};
@@ -874,15 +860,13 @@ struct TALER_DenomFeeSet
/**
- * Set of the fees applying for a given
- * time-range and wire method.
+ * Set of the fees applying for a given time-range and wire method.
*/
struct TALER_WireFeeSet
{
/**
- * The fee the exchange charges for wiring funds
- * to a merchant.
+ * The fee the exchange charges for wiring funds to a merchant.
*/
struct TALER_Amount wire;
@@ -892,12 +876,6 @@ struct TALER_WireFeeSet
*/
struct TALER_Amount closing;
- /**
- * The fee the exchange charges for cross-exchange
- * P2P payments.
- */
- struct TALER_Amount wad;
-
};
@@ -915,13 +893,6 @@ struct TALER_GlobalFeeSet
struct TALER_Amount history;
/**
- * The fee the exchange charges for performing a
- * KYC check on a reserve to turn it into an account
- * that can be used for P2P payments.
- */
- struct TALER_Amount kyc;
-
- /**
* The fee the exchange charges for keeping
* an account or reserve open for a year.
*/
@@ -5052,7 +5023,6 @@ TALER_exchange_offline_wire_fee_verify (
* @param end_time when do the fees start to apply
* @param fees the global fees
* @param purse_timeout how long do unmerged purses stay around
- * @param kyc_timeout how long do we keep funds in a reserve without KYC?
* @param history_expiration how long do we keep the history of an account
* @param purse_account_limit how many concurrent purses are free per account holder
* @param master_priv private key to sign with
@@ -5064,7 +5034,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,
@@ -5078,7 +5047,6 @@ TALER_exchange_offline_global_fee_sign (
* @param end_time when do the fees start to apply
* @param fees the global fees
* @param purse_timeout how long do unmerged purses stay around
- * @param kyc_timeout how long do we keep funds in a reserve without KYC?
* @param history_expiration how long do we keep the history of an account
* @param purse_account_limit how many concurrent purses are free per account holder
* @param master_pub public key to verify against
@@ -5091,7 +5059,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,
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 6268f45a..aa9a5b60 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -231,11 +231,6 @@ struct TALER_EXCHANGE_GlobalFee
struct GNUNET_TIME_Relative purse_timeout;
/**
- * Accounts without KYC will be closed after this time.
- */
- struct GNUNET_TIME_Relative kyc_timeout;
-
- /**
* Account history is limited to this timeframe.
*/
struct GNUNET_TIME_Relative history_expiration;
@@ -4530,7 +4525,6 @@ struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle;
* @param validity_end end date for the provided wire fees
* @param fees the wire fees for this time period
* @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 master_sig signature affirming the wire fees;
@@ -4547,7 +4541,6 @@ TALER_EXCHANGE_management_set_global_fees (
struct GNUNET_TIME_Timestamp validity_end,
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_MasterSignatureP *master_sig,
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index de4babfd..706a2d5a 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -481,7 +481,6 @@ struct TALER_EXCHANGEDB_TableData
struct GNUNET_TIME_Timestamp end_date;
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 TALER_MasterSignatureP master_sig;
@@ -2662,7 +2661,6 @@ typedef void
* @param cls closure
* @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)
@@ -2675,7 +2673,6 @@ typedef void
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,
@@ -4264,7 +4261,6 @@ struct TALER_EXCHANGEDB_Plugin
* @param end_date when does the fees end being valid
* @param fees how high is are the global fees
* @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 master_sig signature over the above by the exchange master key
@@ -4276,7 +4272,6 @@ struct TALER_EXCHANGEDB_Plugin
struct GNUNET_TIME_Timestamp end_date,
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,
@@ -4314,7 +4309,6 @@ struct TALER_EXCHANGEDB_Plugin
* @param[out] end_date when does the fee end being valid
* @param[out] fees how high are the global fees
* @param[out] purse_timeout when do purses time out
- * @param[out] kyc_timeout when do reserves without KYC time out
* @param[out] history_expiration how long are account histories preserved
* @param[out] purse_account_limit how many purses are free per account
* @param[out] master_sig signature over the above by the exchange master key
@@ -4327,7 +4321,6 @@ struct TALER_EXCHANGEDB_Plugin
struct GNUNET_TIME_Timestamp *end_date,
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 TALER_MasterSignatureP *master_sig);
@@ -5398,7 +5391,6 @@ struct TALER_EXCHANGEDB_Plugin
* different global fee exists within this time
* period, an 'invalid' amount is returned.
* @param[out] purse_timeout set to when unmerged purses expire
- * @param[out] kyc_timeout set to when reserves without kyc expire
* @param[out] history_expiration set to when we expire reserve histories
* @param[out] purse_account_limit set to number of free purses
* @return transaction status code
@@ -5410,7 +5402,6 @@ struct TALER_EXCHANGEDB_Plugin
struct GNUNET_TIME_Timestamp end_time,
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);
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index 443cbdb7..12526e95 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -366,7 +366,6 @@ TALER_JSON_spec_amount_any_nbo (const char *name,
* @param[out] gfs a `struct TALER_GlobalFeeSet` to initialize
*/
#define TALER_JSON_SPEC_GLOBAL_FEES(currency,gfs) \
- TALER_JSON_spec_amount ("kyc_fee", (currency), &(gfs)->kyc), \
TALER_JSON_spec_amount ("history_fee", (currency), &(gfs)->history), \
TALER_JSON_spec_amount ("account_fee", (currency), &(gfs)->account), \
TALER_JSON_spec_amount ("purse_fee", (currency), &(gfs)->purse)
@@ -377,7 +376,6 @@ TALER_JSON_spec_amount_any_nbo (const char *name,
* @param gfs a `struct TALER_GlobalFeeSet` to pack
*/
#define TALER_JSON_PACK_GLOBAL_FEES(gfs) \
- TALER_JSON_pack_amount ("kyc_fee", &(gfs)->kyc), \
TALER_JSON_pack_amount ("history_fee", &(gfs)->history), \
TALER_JSON_pack_amount ("account_fee", &(gfs)->account), \
TALER_JSON_pack_amount ("purse_fee", &(gfs)->purse)
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index a964ba4a..aa475bd3 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -2324,7 +2324,6 @@ TALER_TESTING_cmd_auditor_add_denom_sig (const char *label,
* @param wire_method wire method to set wire fees for
* @param wire_fee the wire fee to affirm
* @param closing_fee the closing fee to affirm
- * @param wad_fee wad fee to charge
* @param expected_http_status expected HTTP status from exchange
* @param bad_sig should we use a bogus signature?
* @return the command
@@ -2334,7 +2333,6 @@ TALER_TESTING_cmd_set_wire_fee (const char *label,
const char *wire_method,
const char *wire_fee,
const char *closing_fee,
- const char *wad_fee,
unsigned int expected_http_status,
bool bad_sig);
@@ -2408,15 +2406,13 @@ TALER_TESTING_cmd_exec_offline_sign_keys (const char *label,
* @param config_filename configuration filename.
* @param wire_fee the wire fee to affirm (for the current year)
* @param closing_fee the closing fee to affirm (for the current year)
- * @param wad_fee the wad fee to affirm
* @return the command
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_exec_offline_sign_fees (const char *label,
const char *config_filename,
const char *wire_fee,
- const char *closing_fee,
- const char *wad_fee);
+ const char *closing_fee);
/**
@@ -2425,11 +2421,9 @@ TALER_TESTING_cmd_exec_offline_sign_fees (const char *label,
* @param label command label.
* @param config_filename configuration filename.
* @param history_fee the history fee to charge (for the current year)
- * @param kyc_fee the KYC fee to charge (for the current year)
* @param account_fee the account fee to charge (for the current year)
* @param purse_fee the purse fee to charge (for the current year)
* @param purse_timeout when do purses time out
- * @param kyc_timeout when does the KYC time out
* @param history_expiration when does an account history expire
* @param num_purses number of (free) active purses per account
* @return the command
@@ -2439,11 +2433,9 @@ TALER_TESTING_cmd_exec_offline_sign_global_fees (
const char *label,
const char *config_filename,
const char *history_fee,
- const char *kyc_fee,
const char *account_fee,
const char *purse_fee,
struct GNUNET_TIME_Relative purse_timeout,
- struct GNUNET_TIME_Relative kyc_timeout,
struct GNUNET_TIME_Relative history_expiration,
unsigned int num_purses);
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 14:18:00 +0000