aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test_auditor_api.c1
-rw-r--r--src/testing/test_exchange_api.c3
-rw-r--r--src/testing/test_exchange_api_keys_cherry_picking.c1
-rw-r--r--src/testing/test_exchange_management_api.c5
-rw-r--r--src/testing/test_exchange_p2p.c3
-rw-r--r--src/testing/test_kyc_api.c3
-rw-r--r--src/testing/test_taler_exchange_aggregator.c1
-rw-r--r--src/testing/test_taler_exchange_wirewatch.c1
-rw-r--r--src/testing/testing_api_cmd_offline_sign_global_fees.c22
-rw-r--r--src/testing/testing_api_cmd_offline_sign_wire_fees.c10
-rw-r--r--src/testing/testing_api_cmd_set_wire_fee.c10
11 files changed, 1 insertions, 59 deletions
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,
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-10 18:50:49 +0000