fixing #4386: use more sane configuration and data file structure

2 files changed, 2 insertions, 21 deletions

diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h
index e13df2d46..1f6445212 100644
--- a/src/include/taler_exchangedb_lib.h
+++ b/src/include/taler_exchangedb_lib.h
@@ -37,12 +37,6 @@
  */
 #define TALER_EXCHANGEDB_DIR_DENOMINATION_KEYS "denomkeys"
 
-/**
- * Subdirectory under the exchange's base directory which contains
- * the exchange's auditing information.
- */
-#define TALER_EXCHANGEDB_DIR_AUDITORS "auditors"
-
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -234,9 +228,7 @@ typedef int
 /**
  * Call @a it with information for each auditor found in the @a exchange_base_dir.
  *
- * @param exchange_base_dir base directory for the exchange,
- *                      the signing keys must be in the #TALER_EXCHANGEDB_DIR_DENOMINATION_KEYS
- *                      subdirectory
+ * @param cfg configuration to use
  * @param it function to call with auditor information
  * @param it_cls closure for @a it
  * @return -1 on error, 0 if no files were found, otherwise
@@ -245,7 +237,7 @@ typedef int
  *         as maybe none of the files were well-formed)
  */
 int
-TALER_EXCHANGEDB_auditor_iterate (const char *exchange_base_dir,
+TALER_EXCHANGEDB_auditor_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                   TALER_EXCHANGEDB_AuditorIterator it,
                                   void *it_cls);
 
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 425304152..0b1d40c85 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -96,17 +96,6 @@ TALER_b2s (const void *buf,
 
 
 /**
- * Load configuration by parsing all configuration
- * files in the given directory.
- *
- * @param base_dir directory with the configuration files
- * @return NULL on error, otherwise configuration
- */
-struct GNUNET_CONFIGURATION_Handle *
-TALER_config_load (const char *base_dir);
-
-
-/**
  * Obtain denomination amount from configuration file.
  *
  * @param section section of the configuration to access