taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more unique naming of commands, clean up revocation dir

Browse Source
This commit is contained in:
Christian Grothoff 2020-01-16 15:28:07 +01:00
parent 0a1f6f8ac3
commit 649d95adc3
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/test_exchange_api.c
View File

@ -762,7 +762,7 @@ run (void *cls,
*/
CMD_EXEC_WIREWATCH ("wirewatch-4"),
/* Withdraw a 5 EUR coin, at fee of 1 ct */
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1",
TALER_TESTING_cmd_withdraw_amount ("withdraw-revocation-coin-1",
"create-reserve-1",
"EUR:5",
MHD_HTTP_OK),
@ -772,7 +772,7 @@ run (void *cls,
* deposit fee)
*/TALER_TESTING_cmd_deposit
("deposit-partial",
"withdraw-coin-1", 0,
"withdraw-revocation-coin-1", 0,
bc.user42_payto,
"{\"items\":[{\"name\":\"ice cream\",\
\"value\":\"EUR:1\"}]}",
@ -782,7 +782,7 @@ run (void *cls,
* (EUR:3.17 = 3x EUR:1.03 + 7x EUR:0.13) */
TALER_TESTING_cmd_refresh_melt
("refresh-melt-1",
"withdraw-coin-1",
"withdraw-revocation-coin-1",
MHD_HTTP_OK,
NULL),
/**
@ -818,7 +818,7 @@ run (void *cls,
leaving EUR:3.69. */
TALER_TESTING_cmd_refresh_melt
("refresh-melt-2",
"withdraw-coin-1",
"withdraw-revocation-coin-1",
MHD_HTTP_OK,
"EUR:0.1",
NULL),
@ -836,7 +836,7 @@ run (void *cls,
/* Revoke also original coin denomination */
TALER_TESTING_cmd_revoke ("revoke-3",
MHD_HTTP_OK,
"withdraw-coin-1",
"withdraw-revocation-coin-1",
CONFIG_FILE),
/* Refund coin EUR:0.1 to original coin, creating zombie! */
TALER_TESTING_cmd_payback ("payback-2",
@ -848,7 +848,7 @@ run (void *cls,
/* Refund original (now zombie) coin to reserve */
TALER_TESTING_cmd_payback ("payback-3",
MHD_HTTP_OK,
"withdraw-coin-1",
"withdraw-revocation-coin-1",
"EUR:3.79",
NULL),
/* Check the money is back with the reserve */

22
src/lib/testing_api_helpers_exchange.c
View File

@ -63,12 +63,29 @@ TALER_TESTING_cleanup_files_cfg (void *cls,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
"exchange",
"keydir",
"KEYDIR",
&dir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"exchange",
"keydir");
"KEYDIR");
return GNUNET_SYSERR;
}
if (GNUNET_YES ==
GNUNET_DISK_directory_test (dir,
GNUNET_NO))
GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove (dir));
GNUNET_free (dir);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
"exchange",
"REVOCATION_DIR",
&dir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"exchange",
"REVOCATION_DIR");
return GNUNET_SYSERR;
}
if (GNUNET_YES ==
@ -77,7 +94,6 @@ TALER_TESTING_cleanup_files_cfg (void *cls,
GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove (dir));
GNUNET_free (dir);
// TODO: auditor-specific clean-up here!
return GNUNET_OK;
}