summaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-07-30 17:31:18 +0200
committerChristian Grothoff <christian@grothoff.org>2021-07-30 17:31:18 +0200
commitaf9830453ec3cad428277995f4134f941fbc17b5 (patch)
treec5afc099cfb1b433cb062e277002f6f97751446b /src/testing
parentcbb905a9aae891c6c3af5ead5709951c4f038a2a (diff)
downloadexchange-af9830453ec3cad428277995f4134f941fbc17b5.tar.gz
exchange-af9830453ec3cad428277995f4134f941fbc17b5.tar.bz2
exchange-af9830453ec3cad428277995f4134f941fbc17b5.zip
REVOCATION_DIR is long obsolete, KEYDIR was renamed to KEY_DIR and is in another section
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/testing_api_helpers_exchange.c51
1 files changed, 29 insertions, 22 deletions
diff --git a/src/testing/testing_api_helpers_exchange.c b/src/testing/testing_api_helpers_exchange.c
index 3fa2d416..bc301d77 100644
--- a/src/testing/testing_api_helpers_exchange.c
+++ b/src/testing/testing_api_helpers_exchange.c
@@ -41,21 +41,27 @@ TALER_TESTING_cleanup_files (const char *config_name)
}
-int
-TALER_TESTING_cleanup_files_cfg (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+/**
+ * Remove @a option directory from @a section in @a cfg.
+ *
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+remove_dir (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const char *section,
+ const char *option)
{
char *dir;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
- "exchange",
- "KEYDIR",
+ section,
+ option,
&dir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
- "KEYDIR");
+ section,
+ option);
return GNUNET_SYSERR;
}
if (GNUNET_YES ==
@@ -64,23 +70,24 @@ TALER_TESTING_cleanup_files_cfg (void *cls,
GNUNET_break (GNUNET_OK ==
GNUNET_DISK_directory_remove (dir));
GNUNET_free (dir);
+ return GNUNET_OK;
+}
+
+
+int
+TALER_TESTING_cleanup_files_cfg (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- "exchange",
- "REVOCATION_DIR",
- &dir))
- {
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
- "REVOCATION_DIR");
+ remove_dir (cfg,
+ "taler-exchange-secmod-eddsa",
+ "KEY_DIR"))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ remove_dir (cfg,
+ "taler-exchange-secmod-rsa",
+ "KEY_DIR"))
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);
return GNUNET_OK;
}