diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-01-16 15:28:07 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-01-16 15:28:07 +0100 |
| commit | 649d95adc33afd6331194979adba2e875a8ec7a0 (patch) | |
| tree | 91f9391d6b0cc6a237c989e6fc2b6699100f65a8 | |
| parent | 0a1f6f8ac3438b8a318dd0509c197214ecae4be2 (diff) | |
more unique naming of commands, clean up revocation dir
| -rw-r--r-- | src/lib/test_exchange_api.c | 12 | ||||
| -rw-r--r-- | src/lib/testing_api_helpers_exchange.c | 22 |
2 files changed, 25 insertions, 9 deletions
diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c index 40f142bcf..dd240427e 100644 --- a/src/lib/test_exchange_api.c +++ b/src/lib/test_exchange_api.c @@ -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 */ diff --git a/src/lib/testing_api_helpers_exchange.c b/src/lib/testing_api_helpers_exchange.c index 8f7c75035..fdabd4a44 100644 --- a/src/lib/testing_api_helpers_exchange.c +++ b/src/lib/testing_api_helpers_exchange.c @@ -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; } |