diff options
38 files changed, 38 insertions, 340 deletions
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index 7c68acf48..cf9cbc9c7 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -376,8 +376,8 @@ taler-exchange-offline -c $CONF \ download sign \ enable-account `taler-config -c $CONF -s exchange-account-1 -o PAYTO_URI` \ enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \ - wire-fee now iban TESTKUDOS:0.07 TESTKUDOS:0.01 TESTKUDOS:0.01 \ - global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1h 1year 5 \ + wire-fee now iban TESTKUDOS:0.07 TESTKUDOS:0.01 \ + global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1year 5 \ upload &> ${MY_TMP_DIR}/taler-exchange-offline.log echo -n "." diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index 4188f0517..0474f2b6d 100755 --- a/src/auditor/generate-revoke-basedb.sh +++ b/src/auditor/generate-revoke-basedb.sh @@ -369,8 +369,8 @@ taler-exchange-offline -c $CONF \ download sign \ enable-account `taler-config -c $CONF -s exchange-account-1 -o PAYTO_URI` \ enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \ - wire-fee now iban TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 \ - global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1h 1year 5 \ + wire-fee now iban TESTKUDOS:0.01 TESTKUDOS:0.01 \ + global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1year 5 \ upload &> ${MY_TMP_DIR}/taler-exchange-offline.log echo -n "." diff --git a/src/auditor/taler-helper-auditor-purses.c b/src/auditor/taler-helper-auditor-purses.c index 6a101ee44..7a011d3b2 100644 --- a/src/auditor/taler-helper-auditor-purses.c +++ b/src/auditor/taler-helper-auditor-purses.c @@ -220,7 +220,6 @@ get_purse_fee (struct GNUNET_TIME_Timestamp atime, struct GNUNET_TIME_Timestamp end_date; struct TALER_GlobalFeeSet fees; struct GNUNET_TIME_Relative ptimeout; - struct GNUNET_TIME_Relative ktimeout; struct GNUNET_TIME_Relative hexp; uint32_t pacl; @@ -231,7 +230,6 @@ get_purse_fee (struct GNUNET_TIME_Timestamp atime, &end_date, &fees, &ptimeout, - &ktimeout, &hexp, &pacl, &master_sig)) diff --git a/src/benchmark/taler-aggregator-benchmark.c b/src/benchmark/taler-aggregator-benchmark.c index 869f0aaec..bf9a3f3ec 100644 --- a/src/benchmark/taler-aggregator-benchmark.c +++ b/src/benchmark/taler-aggregator-benchmark.c @@ -562,7 +562,6 @@ run (void *cls, ws = GNUNET_TIME_absolute_to_timestamp (GNUNET_TIME_year_to_time (y - 1)); we = GNUNET_TIME_absolute_to_timestamp (GNUNET_TIME_year_to_time (y)); make_amount (0, 5, &fees.wire); - make_amount (0, 5, &fees.wad); make_amount (0, 5, &fees.closing); memset (&master_sig, 0, diff --git a/src/exchange-tools/taler-exchange-offline.c b/src/exchange-tools/taler-exchange-offline.c index 60a39df96..26ddf738d 100644 --- a/src/exchange-tools/taler-exchange-offline.c +++ b/src/exchange-tools/taler-exchange-offline.c @@ -1639,9 +1639,6 @@ upload_wire_fee (const char *exchange_url, TALER_JSON_spec_amount ("wire_fee", currency, &fees.wire), - TALER_JSON_spec_amount ("wad_fee", - currency, - &fees.wad), TALER_JSON_spec_amount ("closing_fee", currency, &fees.closing), @@ -1741,16 +1738,12 @@ upload_global_fee (const char *exchange_url, struct GNUNET_TIME_Timestamp start_time; struct GNUNET_TIME_Timestamp end_time; 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_JSON_Specification spec[] = { TALER_JSON_spec_amount ("history_fee", currency, &fees.history), - TALER_JSON_spec_amount ("kyc_fee", - currency, - &fees.kyc), TALER_JSON_spec_amount ("account_fee", currency, &fees.account), @@ -1759,8 +1752,6 @@ upload_global_fee (const char *exchange_url, &fees.purse), GNUNET_JSON_spec_relative_time ("purse_timeout", &purse_timeout), - GNUNET_JSON_spec_relative_time ("kyc_timeout", - &kyc_timeout), GNUNET_JSON_spec_relative_time ("history_expiration", &history_expiration), GNUNET_JSON_spec_uint32 ("purse_account_limit", @@ -1801,7 +1792,6 @@ upload_global_fee (const char *exchange_url, end_time, &fees, purse_timeout, - kyc_timeout, history_expiration, purse_account_limit, &master_sig, @@ -2752,7 +2742,7 @@ do_del_wire (char *const *args) * * @param args the array of command-line arguments to process next; * args[0] must be the year, args[1] the wire method, args[2] the wire fee and args[3] - * the closing fee and args[4] the wad fee. + * the closing fee. */ static void do_set_wire_fee (char *const *args) @@ -2776,7 +2766,6 @@ do_set_wire_fee (char *const *args) (NULL == args[1]) || (NULL == args[2]) || (NULL == args[3]) || - (NULL == args[4]) || ( (1 != sscanf (args[0], "%u%c", &year, @@ -2788,13 +2777,10 @@ do_set_wire_fee (char *const *args) &fees.wire)) || (GNUNET_OK != TALER_string_to_amount (args[3], - &fees.closing)) || - (GNUNET_OK != - TALER_string_to_amount (args[4], - &fees.wad)) ) + &fees.closing)) ) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "You must use YEAR, METHOD, WIRE-FEE, CLOSING-FEE and WAD-FEE as arguments for this subcommand\n"); + "You must use YEAR, METHOD, WIRE-FEE, and CLOSING-FEE as arguments for this subcommand\n"); test_shutdown (); global_ret = EXIT_INVALIDARGUMENT; return; @@ -2826,13 +2812,11 @@ do_set_wire_fee (char *const *args) end_time), 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_data_auto ("master_sig", &master_sig))); - next (args + 5); + next (args + 4); } @@ -2840,9 +2824,9 @@ do_set_wire_fee (char *const *args) * Set global fees for the given year. * * @param args the array of command-line arguments to process next; - * args[0] must be the year, args[1] the history fee, args[2] the kyc fee, args[3] - * the account fee and args[4] the purse fee. These are followed by args[5] purse timeout, - * args[6] kyc timeout and args[7] history expiration. Last is args[8] the (free) purse account limit. + * args[0] must be the year, args[1] the history fee, args[2] + * the account fee and args[3] the purse fee. These are followed by args[4] purse timeout, + * args[5] history expiration. Last is args[6] the (free) purse account limit. */ static void do_set_global_fee (char *const *args) @@ -2852,7 +2836,6 @@ do_set_global_fee (char *const *args) unsigned int year; struct TALER_GlobalFeeSet fees; struct GNUNET_TIME_Relative purse_timeout; - struct GNUNET_TIME_Relative kyc_timeout; struct GNUNET_TIME_Relative history_expiration; unsigned int purse_account_limit; struct GNUNET_TIME_Timestamp start_time; @@ -2873,8 +2856,6 @@ do_set_global_fee (char *const *args) (NULL == args[4]) || (NULL == args[5]) || (NULL == args[6]) || - (NULL == args[7]) || - (NULL == args[8]) || ( (1 != sscanf (args[0], "%u%c", &year, @@ -2886,29 +2867,23 @@ do_set_global_fee (char *const *args) &fees.history)) || (GNUNET_OK != TALER_string_to_amount (args[2], - &fees.kyc)) || - (GNUNET_OK != - TALER_string_to_amount (args[3], &fees.account)) || (GNUNET_OK != - TALER_string_to_amount (args[4], + TALER_string_to_amount (args[3], &fees.purse)) || (GNUNET_OK != - GNUNET_STRINGS_fancy_time_to_relative (args[5], + GNUNET_STRINGS_fancy_time_to_relative (args[4], &purse_timeout)) || (GNUNET_OK != - GNUNET_STRINGS_fancy_time_to_relative (args[6], - &kyc_timeout)) || - (GNUNET_OK != - GNUNET_STRINGS_fancy_time_to_relative (args[7], + GNUNET_STRINGS_fancy_time_to_relative (args[5], &history_expiration)) || - (1 != sscanf (args[8], + (1 != sscanf (args[6], "%u%c", &purse_account_limit, &dummy)) ) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "You must use YEAR, HISTORY-FEE, KYC-FEE, ACCOUNT-FEE, PURSE-FEE, PURSE-TIMEOUT, KYC-TIMEOUT, HISTORY-EXPIRATION and PURSE-ACCOUNT-LIMIT as arguments for this subcommand\n"); + "You must use YEAR, HISTORY-FEE, ACCOUNT-FEE, PURSE-FEE, PURSE-TIMEOUT, HISTORY-EXPIRATION and PURSE-ACCOUNT-LIMIT as arguments for this subcommand\n"); test_shutdown (); global_ret = EXIT_INVALIDARGUMENT; return; @@ -2928,7 +2903,6 @@ do_set_global_fee (char *const *args) end_time, &fees, purse_timeout, - kyc_timeout, history_expiration, (uint32_t) purse_account_limit, &master_priv, @@ -2941,23 +2915,19 @@ do_set_global_fee (char *const *args) end_time), TALER_JSON_pack_amount ("history_fee", &fees.history), - TALER_JSON_pack_amount ("kyc_fee", - &fees.kyc), TALER_JSON_pack_amount ("account_fee", &fees.account), TALER_JSON_pack_amount ("purse_fee", &fees.purse), GNUNET_JSON_pack_time_rel ("purse_timeout", purse_timeout), - GNUNET_JSON_pack_time_rel ("kyc_timeout", - kyc_timeout), GNUNET_JSON_pack_time_rel ("history_expiration", history_expiration), GNUNET_JSON_pack_uint64 ("purse_account_limit", (uint32_t) purse_account_limit), GNUNET_JSON_pack_data_auto ("master_sig", &master_sig))); - next (args + 9); + next (args + 7); } @@ -4476,13 +4446,13 @@ work (void *cls) { .name = "wire-fee", .help = - "sign wire fees for the given year (year, wire method, wire fee, closing fee and wad fee must be given as arguments)", + "sign wire fees for the given year (year, wire method, wire fee, and closing fee must be given as arguments)", .cb = &do_set_wire_fee }, { .name = "global-fee", .help = - "sign global fees for the given year (year, history fee, kyc fee, account fee, purse fee, purse timeout, kyc timeout, history expiration and the maximum number of free purses per account must be given as arguments)", + "sign global fees for the given year (year, history fee, account fee, purse fee, purse timeout, history expiration and the maximum number of free purses per account must be given as arguments)", .cb = &do_set_global_fee }, { 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", diff --git a/src/exchangedb/exchange-0001-part.sql b/src/exchangedb/exchange-0001-part.sql index 4903b8879..99883a279 100644 --- a/src/exchangedb/exchange-0001-part.sql +++ b/src/exchangedb/exchange-0001-part.sql @@ -813,8 +813,6 @@ CREATE TABLE IF NOT EXISTS wire_fee ,wire_fee_frac INT4 NOT NULL ,closing_fee_val INT8 NOT NULL ,closing_fee_frac INT4 NOT NULL - ,wad_fee_val INT8 NOT NULL - ,wad_fee_frac INT4 NOT NULL ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64) ,PRIMARY KEY (wire_method, start_date) ); @@ -836,14 +834,11 @@ CREATE TABLE IF NOT EXISTS global_fee ,end_date INT8 NOT NULL ,history_fee_val INT8 NOT NULL ,history_fee_frac INT4 NOT NULL - ,kyc_fee_val INT8 NOT NULL - ,kyc_fee_frac INT4 NOT NULL ,account_fee_val INT8 NOT NULL ,account_fee_frac INT4 NOT NULL ,purse_fee_val INT8 NOT NULL ,purse_fee_frac INT4 NOT NULL ,purse_timeout INT8 NOT NULL - ,kyc_timeout INT8 NOT NULL ,history_expiration INT8 NOT NULL ,purse_account_limit INT4 NOT NULL ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64) diff --git a/src/exchangedb/pg_insert_records_by_table.c b/src/exchangedb/pg_insert_records_by_table.c index 99173cc60..47b368318 100644 --- a/src/exchangedb/pg_insert_records_by_table.c +++ b/src/exchangedb/pg_insert_records_by_table.c @@ -1037,7 +1037,6 @@ irbt_cb_table_wire_fee (struct PostgresClosure *pg, GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.end_date), TALER_PQ_query_param_amount (&td->details.wire_fee.fees.wire), TALER_PQ_query_param_amount (&td->details.wire_fee.fees.closing), - TALER_PQ_query_param_amount (&td->details.wire_fee.fees.wad), GNUNET_PQ_query_param_auto_from_type (&td->details.wire_fee.master_sig), GNUNET_PQ_query_param_end }; @@ -1084,16 +1083,12 @@ irbt_cb_table_global_fee (struct PostgresClosure *pg, TALER_PQ_query_param_amount ( &td->details.global_fee.fees.history), TALER_PQ_query_param_amount ( - &td->details.global_fee.fees.kyc), - TALER_PQ_query_param_amount ( &td->details.global_fee.fees.account), TALER_PQ_query_param_amount ( &td->details.global_fee.fees.purse), GNUNET_PQ_query_param_relative_time ( &td->details.global_fee.purse_timeout), GNUNET_PQ_query_param_relative_time ( - &td->details.global_fee.kyc_timeout), - GNUNET_PQ_query_param_relative_time ( &td->details.global_fee.history_expiration), GNUNET_PQ_query_param_uint32 ( &td->details.global_fee.purse_account_limit), @@ -1110,19 +1105,16 @@ irbt_cb_table_global_fee (struct PostgresClosure *pg, ",end_date" ",history_fee_val" ",history_fee_frac" - ",kyc_fee_val" - ",kyc_fee_frac" ",account_fee_val" ",account_fee_frac" ",purse_fee_val" ",purse_fee_frac" ",purse_timeout" - ",kyc_timeout" ",history_expiration" ",purse_account_limit" ",master_sig" ") VALUES " - "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);"); + "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13);"); return GNUNET_PQ_eval_prepared_non_select (pg->conn, "insert_into_table_global_fee", params); diff --git a/src/exchangedb/pg_lookup_records_by_table.c b/src/exchangedb/pg_lookup_records_by_table.c index b7435bc2b..e28edef07 100644 --- a/src/exchangedb/pg_lookup_records_by_table.c +++ b/src/exchangedb/pg_lookup_records_by_table.c @@ -1194,8 +1194,6 @@ lrbt_cb_table_wire_fee (void *cls, &td.details.wire_fee.fees.wire), TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee", &td.details.wire_fee.fees.closing), - TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee", - &td.details.wire_fee.fees.wad), GNUNET_PQ_result_spec_auto_from_type ("master_sig", &td.details.wire_fee.master_sig), GNUNET_PQ_result_spec_end @@ -1251,9 +1249,6 @@ lrbt_cb_table_global_fee (void *cls, "history_fee", &td.details.global_fee.fees.history), TALER_PQ_RESULT_SPEC_AMOUNT ( - "kyc_fee", - &td.details.global_fee.fees.kyc), - TALER_PQ_RESULT_SPEC_AMOUNT ( "account_fee", &td.details.global_fee.fees.account), TALER_PQ_RESULT_SPEC_AMOUNT ( @@ -1263,9 +1258,6 @@ lrbt_cb_table_global_fee (void *cls, "purse_timeout", &td.details.global_fee.purse_timeout), GNUNET_PQ_result_spec_relative_time ( - "kyc_timeout", - &td.details.global_fee.kyc_timeout), - GNUNET_PQ_result_spec_relative_time ( "history_expiration", &td.details.global_fee.history_expiration), GNUNET_PQ_result_spec_uint32 ( @@ -2567,14 +2559,11 @@ TEH_PG_lookup_records_by_table (void *cls, ",end_date" ",history_fee_val" ",history_fee_frac" - ",kyc_fee_val" - ",kyc_fee_frac" ",account_fee_val" ",account_fee_frac" ",purse_fee_val" ",purse_fee_frac" ",purse_timeout" - ",kyc_timeout" ",history_expiration" ",purse_account_limit" ",master_sig" diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 5ccb71127..9f14cc289 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -1598,8 +1598,6 @@ prepare_statements (struct PostgresClosure *pg) ",wire_fee_frac" ",closing_fee_val" ",closing_fee_frac" - ",wad_fee_val" - ",wad_fee_frac" ",master_sig" " FROM wire_fee" " WHERE wire_method=$1" @@ -1613,14 +1611,11 @@ prepare_statements (struct PostgresClosure *pg) ",end_date" ",history_fee_val" ",history_fee_frac" - ",kyc_fee_val" - ",kyc_fee_frac" ",account_fee_val" ",account_fee_frac" ",purse_fee_val" ",purse_fee_frac" ",purse_timeout" - ",kyc_timeout" ",history_expiration" ",purse_account_limit" ",master_sig" @@ -1635,14 +1630,11 @@ prepare_statements (struct PostgresClosure *pg) ",end_date" ",history_fee_val" ",history_fee_frac" - ",kyc_fee_val" - ",kyc_fee_frac" ",account_fee_val" ",account_fee_frac" ",purse_fee_val" ",purse_fee_frac" ",purse_timeout" - ",kyc_timeout" ",history_expiration" ",purse_account_limit" ",master_sig" @@ -1659,11 +1651,9 @@ prepare_statements (struct PostgresClosure *pg) ",wire_fee_frac" ",closing_fee_val" ",closing_fee_frac" - ",wad_fee_val" - ",wad_fee_frac" ",master_sig" ") VALUES " - "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);"), + "($1, $2, $3, $4, $5, $6, $7, $8);"), /* Used in #postgres_insert_global_fee */ GNUNET_PQ_make_prepare ( "insert_global_fee", @@ -1672,19 +1662,16 @@ prepare_statements (struct PostgresClosure *pg) ",end_date" ",history_fee_val" ",history_fee_frac" - ",kyc_fee_val" - ",kyc_fee_frac" ",account_fee_val" ",account_fee_frac" ",purse_fee_val" ",purse_fee_frac" ",purse_timeout" - ",kyc_timeout" ",history_expiration" ",purse_account_limit" ",master_sig" ") VALUES " - "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15);"), + "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);"), /* Used in #postgres_store_wire_transfer_out */ GNUNET_PQ_make_prepare ( "insert_wire_out", @@ -1953,8 +1940,6 @@ prepare_statements (struct PostgresClosure *pg) ",wire_fee_frac" ",closing_fee_val" ",closing_fee_frac" - ",wad_fee_val" - ",wad_fee_frac" ",start_date" ",end_date" ",master_sig" @@ -2057,8 +2042,6 @@ prepare_statements (struct PostgresClosure *pg) ",wire_fee_frac" ",closing_fee_val" ",closing_fee_frac" - ",wad_fee_val" - ",wad_fee_frac" " FROM wire_fee" " WHERE wire_method=$1" " AND end_date > $2" @@ -2069,14 +2052,11 @@ prepare_statements (struct PostgresClosure *pg) "SELECT" " history_fee_val" ",history_fee_frac" - ",kyc_fee_val" - ",kyc_fee_frac" ",account_fee_val" ",account_fee_frac" ",purse_fee_val" ",purse_fee_frac" ",purse_timeout" - ",kyc_timeout" ",history_expiration" ",purse_account_limit" " FROM global_fee" @@ -6290,8 +6270,6 @@ postgres_get_wire_fee (void *cls, end_date), TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee", &fees->wire), - TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee", - &fees->wad), TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee", &fees->closing), GNUNET_PQ_result_spec_auto_from_type ("master_sig", @@ -6315,7 +6293,6 @@ postgres_get_wire_fee (void *cls, * @param[out] end_date when does the fee end being valid * @param[out] fees how high are the wire fees * @param[out] purse_timeout set to how long we keep unmerged purses - * @param[out] kyc_timeout set to how long we keep accounts without KYC * @param[out] history_expiration set to how long we keep account histories * @param[out] purse_account_limit set to the number of free purses per account * @param[out] master_sig signature over the above by the exchange master key @@ -6328,7 +6305,6 @@ postgres_get_global_fee (void *cls, 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) @@ -6345,16 +6321,12 @@ postgres_get_global_fee (void *cls, end_date), TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee", &fees->history), - TALER_PQ_RESULT_SPEC_AMOUNT ("kyc_fee", - &fees->kyc), TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee", &fees->account), TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee", &fees->purse), GNUNET_PQ_result_spec_relative_time ("purse_timeout", purse_timeout), - GNUNET_PQ_result_spec_relative_time ("kyc_timeout", - kyc_timeout), GNUNET_PQ_result_spec_relative_time ("history_expiration", history_expiration), GNUNET_PQ_result_spec_uint32 ("purse_account_limit", @@ -6418,7 +6390,6 @@ global_fees_cb (void *cls, { 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; @@ -6431,16 +6402,12 @@ global_fees_cb (void *cls, &end_date), TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee", &fees.history), - TALER_PQ_RESULT_SPEC_AMOUNT ("kyc_fee", - &fees.kyc), TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee", &fees.account), TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee", &fees.purse), GNUNET_PQ_result_spec_relative_time ("purse_timeout", &purse_timeout), - GNUNET_PQ_result_spec_relative_time ("kyc_timeout", - &kyc_timeout), GNUNET_PQ_result_spec_relative_time ("history_expiration", &history_expiration), GNUNET_PQ_result_spec_uint32 ("purse_account_limit", @@ -6461,7 +6428,6 @@ global_fees_cb (void *cls, gctx->cb (gctx->cb_cls, &fees, purse_timeout, - kyc_timeout, history_expiration, purse_account_limit, start_date, @@ -6536,7 +6502,6 @@ postgres_insert_wire_fee (void *cls, GNUNET_PQ_query_param_timestamp (&end_date), TALER_PQ_query_param_amount (&fees->wire), TALER_PQ_query_param_amount (&fees->closing), - TALER_PQ_query_param_amount (&fees->wad), GNUNET_PQ_query_param_auto_from_type (master_sig), GNUNET_PQ_query_param_end }; @@ -6598,7 +6563,6 @@ postgres_insert_wire_fee (void *cls, * @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 @@ -6610,7 +6574,6 @@ postgres_insert_global_fee (void *cls, 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, const struct TALER_MasterSignatureP *master_sig) @@ -6620,11 +6583,9 @@ postgres_insert_global_fee (void *cls, GNUNET_PQ_query_param_timestamp (&start_date), GNUNET_PQ_query_param_timestamp (&end_date), TALER_PQ_query_param_amount (&fees->history), - TALER_PQ_query_param_amount (&fees->kyc), TALER_PQ_query_param_amount (&fees->account), TALER_PQ_query_param_amount (&fees->purse), GNUNET_PQ_query_param_relative_time (&purse_timeout), - GNUNET_PQ_query_param_relative_time (&kyc_timeout), GNUNET_PQ_query_param_relative_time (&history_expiration), GNUNET_PQ_query_param_uint32 (&purse_account_limit), GNUNET_PQ_query_param_auto_from_type (master_sig), @@ -6636,7 +6597,6 @@ postgres_insert_global_fee (void *cls, struct GNUNET_TIME_Timestamp ed; enum GNUNET_DB_QueryStatus qs; struct GNUNET_TIME_Relative pt; - struct GNUNET_TIME_Relative kt; struct GNUNET_TIME_Relative he; uint32_t pal; @@ -6646,7 +6606,6 @@ postgres_insert_global_fee (void *cls, &ed, &wx, &pt, - &kt, &he, &pal, &sig); @@ -6680,9 +6639,6 @@ postgres_insert_global_fee (void *cls, if ( (GNUNET_TIME_relative_cmp (purse_timeout, !=, pt)) || - (GNUNET_TIME_relative_cmp (kyc_timeout, - !=, - kt)) || (GNUNET_TIME_relative_cmp (history_expiration, !=, he)) ) @@ -10017,8 +9973,6 @@ get_wire_fees_cb (void *cls, &fees.wire), TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee", &fees.closing), - TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee", - &fees.wad), GNUNET_PQ_result_spec_timestamp ("start_date", &start_date), GNUNET_PQ_result_spec_timestamp ("end_date", @@ -10419,8 +10373,6 @@ wire_fee_by_time_helper (void *cls, &fs.wire), TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee", &fs.closing), - TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee", - &fs.wad), GNUNET_PQ_result_spec_end }; @@ -10517,11 +10469,6 @@ struct GlobalFeeLookupContext struct GNUNET_TIME_Relative *purse_timeout; /** - * Set to timeout of accounts without kyc. - */ - struct GNUNET_TIME_Relative *kyc_timeout; - - /** * Set to history expiration for reserves. */ struct GNUNET_TIME_Relative *history_expiration; @@ -10558,22 +10505,17 @@ global_fee_by_time_helper (void *cls, { struct TALER_GlobalFeeSet fs; 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_PQ_ResultSpec rs[] = { TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee", &fs.history), - TALER_PQ_RESULT_SPEC_AMOUNT ("kyc_fee", - &fs.kyc), TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee", &fs.account), TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee", &fs.purse), GNUNET_PQ_result_spec_relative_time ("purse_timeout", &purse_timeout), - GNUNET_PQ_result_spec_relative_time ("kyc_timeout", - &kyc_timeout), GNUNET_PQ_result_spec_relative_time ("history_expiration", &history_expiration), GNUNET_PQ_result_spec_uint32 ("purse_account_limit", @@ -10597,7 +10539,6 @@ global_fee_by_time_helper (void *cls, { *wlc->fees = fs; *wlc->purse_timeout = purse_timeout; - *wlc->kyc_timeout = kyc_timeout; *wlc->history_expiration = history_expiration; *wlc->purse_account_limit = purse_account_limit; continue; @@ -10609,9 +10550,6 @@ global_fee_by_time_helper (void *cls, (GNUNET_TIME_relative_cmp (purse_timeout, !=, *wlc->purse_timeout)) || - (GNUNET_TIME_relative_cmp (kyc_timeout, - !=, - *wlc->kyc_timeout)) || (GNUNET_TIME_relative_cmp (history_expiration, !=, *wlc->history_expiration)) ) @@ -10636,7 +10574,6 @@ global_fee_by_time_helper (void *cls, * 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 @@ -10648,7 +10585,6 @@ postgres_lookup_global_fee_by_time ( 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) { @@ -10661,7 +10597,6 @@ postgres_lookup_global_fee_by_time ( struct GlobalFeeLookupContext wlc = { .fees = fees, .purse_timeout = purse_timeout, - .kyc_timeout = kyc_timeout, .history_expiration = history_expiration, .purse_account_limit = purse_account_limit, .pg = pg diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index 77f3dab26..eb990412e 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c @@ -819,9 +819,6 @@ test_wire_fees (void) GNUNET_assert (GNUNET_OK == TALER_string_to_amount (CURRENCY ":2.424242", &fees.closing)); - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (CURRENCY ":3.424242", - &fees.wad)); GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, &master_sig, sizeof (master_sig)); diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 2e85f6d91..73b92fe86 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 6268f45ac..aa9a5b607 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 de4babfd0..706a2d5a2 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 443cbdb7b..12526e954 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 a964ba4a1..aa475bd33 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); diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 707e5cf5b..d6e12cc17 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -529,8 +529,6 @@ parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf, &gf->end_date), GNUNET_JSON_spec_relative_time ("purse_timeout", &gf->purse_timeout), - GNUNET_JSON_spec_relative_time ("account_kyc_timeout", - &gf->kyc_timeout), GNUNET_JSON_spec_relative_time ("history_expiration", &gf->history_expiration), GNUNET_JSON_spec_uint32 ("purse_account_limit", @@ -563,7 +561,6 @@ parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf, gf->end_date, &gf->fees, gf->purse_timeout, - gf->kyc_timeout, gf->history_expiration, gf->purse_account_limit, &key_data->master_pub, diff --git a/src/lib/exchange_api_management_set_global_fee.c b/src/lib/exchange_api_management_set_global_fee.c index b600c8cbe..c8fae5c18 100644 --- a/src/lib/exchange_api_management_set_global_fee.c +++ b/src/lib/exchange_api_management_set_global_fee.c @@ -130,7 +130,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, @@ -164,16 +163,12 @@ TALER_EXCHANGE_management_set_global_fees ( validity_end), TALER_JSON_pack_amount ("history_fee", &fees->history), - TALER_JSON_pack_amount ("kyc_fee", - &fees->kyc), TALER_JSON_pack_amount ("account_fee", &fees->account), TALER_JSON_pack_amount ("purse_fee", &fees->purse), GNUNET_JSON_pack_time_rel ("purse_timeout", purse_timeout), - GNUNET_JSON_pack_time_rel ("kyc_timeout", - kyc_timeout), GNUNET_JSON_pack_time_rel ("history_expiration", history_expiration), GNUNET_JSON_pack_uint64 ("purse_account_limit", diff --git a/src/lib/exchange_api_management_set_wire_fee.c b/src/lib/exchange_api_management_set_wire_fee.c index 5951b6e20..725261161 100644 --- a/src/lib/exchange_api_management_set_wire_fee.c +++ b/src/lib/exchange_api_management_set_wire_fee.c @@ -163,8 +163,6 @@ TALER_EXCHANGE_management_set_wire_fees ( validity_end), TALER_JSON_pack_amount ("closing_fee", &fees->closing), - TALER_JSON_pack_amount ("wad_fee", - &fees->wad), TALER_JSON_pack_amount ("wire_fee", &fees->wire)); eh = TALER_EXCHANGE_curl_easy_get_ (swfh->url); diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c index 3079064c8..995a0933c 100644 --- a/src/lib/exchange_api_wire.c +++ b/src/lib/exchange_api_wire.c @@ -145,8 +145,6 @@ parse_fees (json_t *fees) &wa->master_sig), TALER_JSON_spec_amount_any ("wire_fee", &wa->fees.wire), - TALER_JSON_spec_amount_any ("wad_fee", - &wa->fees.wad), TALER_JSON_spec_amount_any ("closing_fee", &wa->fees.closing), GNUNET_JSON_spec_timestamp ("start_date", diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c index 305d31a09..10e547668 100644 --- a/src/testing/test_auditor_api.c +++ b/src/testing/test_auditor_api.c @@ -651,7 +651,6 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", config_file, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_auditor_add ("add-auditor-OK", MHD_HTTP_NO_CONTENT, diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c index f30701c34..dd39ee940 100644 --- a/src/testing/test_exchange_api.c +++ b/src/testing/test_exchange_api.c @@ -1248,8 +1248,6 @@ run (void *cls, "EUR:0.01", "EUR:0.01", "EUR:0.01", - "EUR:0.01", - GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_DAYS, 1), @@ -1258,7 +1256,6 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", config_file, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys", 1), diff --git a/src/testing/test_exchange_api_keys_cherry_picking.c b/src/testing/test_exchange_api_keys_cherry_picking.c index 4f0c4048a..4d61ed2e7 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking.c +++ b/src/testing/test_exchange_api_keys_cherry_picking.c @@ -69,7 +69,6 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", config_file, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys", config_file), diff --git a/src/testing/test_exchange_management_api.c b/src/testing/test_exchange_management_api.c index 2bf0af3bd..3195b5a12 100644 --- a/src/testing/test_exchange_management_api.c +++ b/src/testing/test_exchange_management_api.c @@ -85,35 +85,30 @@ run (void *cls, "foo-method", "EUR:1", "EUR:5", - "EUR:3", MHD_HTTP_NO_CONTENT, false), TALER_TESTING_cmd_set_wire_fee ("set-fee-conflicting", "foo-method", "EUR:1", "EUR:1", - "EUR:3", MHD_HTTP_CONFLICT, false), TALER_TESTING_cmd_set_wire_fee ("set-fee-bad-signature", "bar-method", "EUR:1", "EUR:1", - "EUR:3", MHD_HTTP_FORBIDDEN, true), TALER_TESTING_cmd_set_wire_fee ("set-fee-other-method", "bar-method", "EUR:1", "EUR:1", - "EUR:3", MHD_HTTP_NO_CONTENT, false), TALER_TESTING_cmd_set_wire_fee ("set-fee-idempotent", "bar-method", "EUR:1", "EUR:1", - "EUR:3", MHD_HTTP_NO_CONTENT, false), TALER_TESTING_cmd_wire_add ("add-wire-account", diff --git a/src/testing/test_exchange_p2p.c b/src/testing/test_exchange_p2p.c index 222cd3d41..27d47bfd4 100644 --- a/src/testing/test_exchange_p2p.c +++ b/src/testing/test_exchange_p2p.c @@ -474,15 +474,12 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-wire-fees", config_file, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_exec_offline_sign_global_fees ("offline-sign-global-fees", config_file, "EUR:0.01", "EUR:0.01", "EUR:0.01", - "EUR:0.01", - GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_DAYS, 1), diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c index 0933956c1..8ab4cffc8 100644 --- a/src/testing/test_kyc_api.c +++ b/src/testing/test_kyc_api.c @@ -407,15 +407,12 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", CONFIG_FILE, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_exec_offline_sign_global_fees ("offline-sign-global-fees", CONFIG_FILE, "EUR:0.01", "EUR:0.01", "EUR:0.01", - "EUR:0.01", - GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_DAYS, 1), diff --git a/src/testing/test_taler_exchange_aggregator.c b/src/testing/test_taler_exchange_aggregator.c index 05e8805c9..bee7e37e5 100644 --- a/src/testing/test_taler_exchange_aggregator.c +++ b/src/testing/test_taler_exchange_aggregator.c @@ -99,7 +99,6 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", config_filename, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), // check no aggregation happens on a empty database CMD_EXEC_AGGREGATOR ("run-aggregator-on-empty-db", diff --git a/src/testing/test_taler_exchange_wirewatch.c b/src/testing/test_taler_exchange_wirewatch.c index 95274de49..eecb4fd65 100644 --- a/src/testing/test_taler_exchange_wirewatch.c +++ b/src/testing/test_taler_exchange_wirewatch.c @@ -85,7 +85,6 @@ run (void *cls, TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees", config_filename, "EUR:0.01", - "EUR:0.01", "EUR:0.01"), TALER_TESTING_cmd_auditor_add ("add-auditor-OK", MHD_HTTP_NO_CONTENT, diff --git a/src/testing/testing_api_cmd_offline_sign_global_fees.c b/src/testing/testing_api_cmd_offline_sign_global_fees.c index 7c9032255..db3916258 100644 --- a/src/testing/testing_api_cmd_offline_sign_global_fees.c +++ b/src/testing/testing_api_cmd_offline_sign_global_fees.c @@ -52,11 +52,6 @@ struct OfflineSignState const char *history_fee_s; /** - * The KYC fee to sign. - */ - const char *kyc_fee_s; - - /** * The account fee to sign. */ const char *account_fee_s; @@ -72,11 +67,6 @@ struct OfflineSignState struct GNUNET_TIME_Relative purse_timeout; /** - * How long does a user have to complete the KYC? - */ - struct GNUNET_TIME_Relative kyc_timeout; - - /** * How long do we keep the history? */ struct GNUNET_TIME_Relative history_expiration; @@ -104,7 +94,6 @@ offlinesign_run (void *cls, char num_purses[12]; char history_expiration[32]; char purse_timeout[32]; - char kyc_timeout[32]; GNUNET_snprintf (num_purses, sizeof (num_purses), @@ -120,11 +109,6 @@ offlinesign_run (void *cls, "%s", GNUNET_TIME_relative2s (ks->purse_timeout, false)); - GNUNET_snprintf (kyc_timeout, - sizeof (kyc_timeout), - "%s", - GNUNET_TIME_relative2s (ks->kyc_timeout, - false)); ks->offlinesign_proc = GNUNET_OS_start_process ( GNUNET_OS_INHERIT_STD_ALL, @@ -136,11 +120,9 @@ offlinesign_run (void *cls, "global-fee", "now", ks->history_fee_s, - ks->kyc_fee_s, ks->account_fee_s, ks->purse_fee_s, purse_timeout, - kyc_timeout, history_expiration, num_purses, "upload", @@ -215,11 +197,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) { @@ -228,11 +208,9 @@ TALER_TESTING_cmd_exec_offline_sign_global_fees ( ks = GNUNET_new (struct OfflineSignState); ks->config_filename = config_filename; ks->history_fee_s = history_fee; - ks->kyc_fee_s = kyc_fee; ks->account_fee_s = account_fee; ks->purse_fee_s = purse_fee; ks->purse_timeout = purse_timeout; - ks->kyc_timeout = kyc_timeout; ks->history_expiration = history_expiration; ks->num_purses = num_purses; { diff --git a/src/testing/testing_api_cmd_offline_sign_wire_fees.c b/src/testing/testing_api_cmd_offline_sign_wire_fees.c index 55746ebc5..0fccbcd0a 100644 --- a/src/testing/testing_api_cmd_offline_sign_wire_fees.c +++ b/src/testing/testing_api_cmd_offline_sign_wire_fees.c @@ -52,11 +52,6 @@ struct OfflineSignState const char *wire_fee_s; /** - * The wad fee to sign. - */ - const char *wad_fee_s; - - /** * The closing fee to sign. */ const char *closing_fee_s; @@ -91,7 +86,6 @@ offlinesign_run (void *cls, "x-taler-bank", ks->wire_fee_s, ks->closing_fee_s, - ks->wad_fee_s, "upload", NULL); if (NULL == ks->offlinesign_proc) @@ -163,15 +157,13 @@ 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) { struct OfflineSignState *ks; ks = GNUNET_new (struct OfflineSignState); ks->config_filename = config_filename; ks->wire_fee_s = wire_fee; - ks->wad_fee_s = wad_fee; ks->closing_fee_s = closing_fee; { struct TALER_TESTING_Command cmd = { diff --git a/src/testing/testing_api_cmd_set_wire_fee.c b/src/testing/testing_api_cmd_set_wire_fee.c index 8eb993878..ed3448ac5 100644 --- a/src/testing/testing_api_cmd_set_wire_fee.c +++ b/src/testing/testing_api_cmd_set_wire_fee.c @@ -61,11 +61,6 @@ struct WireFeeState const char *closing_fee; /** - * Wad fee amount to use. - */ - const char *wad_fee; - - /** * Expected HTTP response code. */ unsigned int expected_response_code; @@ -141,9 +136,6 @@ wire_add_run (void *cls, TALER_string_to_amount (ds->closing_fee, &fees.closing)) || (GNUNET_OK != - TALER_string_to_amount (ds->wad_fee, - &fees.wad)) || - (GNUNET_OK != TALER_string_to_amount (ds->wire_fee, &fees.wire)) ) { @@ -217,7 +209,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) { @@ -229,7 +220,6 @@ TALER_TESTING_cmd_set_wire_fee (const char *label, ds->wire_method = wire_method; ds->wire_fee = wire_fee; ds->closing_fee = closing_fee; - ds->wad_fee = wad_fee; { struct TALER_TESTING_Command cmd = { .cls = ds, 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; } |