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

report on file used

Browse Source
This commit is contained in:
Christian Grothoff 2019-12-07 17:20:09 +01:00
parent 91a418fe80
commit 9cbd1cc139
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/exchange-tools/taler-exchange-wire.c
View File

@ -198,8 +198,9 @@ run (void *cls,
&mpub_cfg)) &mpub_cfg))
{ {
fprintf (stderr, fprintf (stderr,
"Master public key `%s' in configuration does not match our master private key!\n", "Master public key `%s' in configuration does not match our master private key from `%s'!\n",
masters); masters,
masterkeyfile);
GNUNET_free (masters); GNUNET_free (masters);
global_ret = 1; global_ret = 1;
return; return;

9
src/lib/test_exchange_api.conf
View File

@ -5,6 +5,15 @@
# Persistant data storage for the testcase # Persistant data storage for the testcase
TALER_TEST_HOME = test_exchange_api_home/ TALER_TEST_HOME = test_exchange_api_home/
# Persistant data storage
TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
# Configuration files
TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
# Cached data, no big deal if lost
TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
[taler] [taler]
# Currency supported by the exchange (can only be one) # Currency supported by the exchange (can only be one)
CURRENCY = EUR CURRENCY = EUR

11
src/lib/testing_api_helpers.c
View File

@ -674,7 +674,6 @@ TALER_TESTING_wait_auditor_ready (const char *base_url)
* @param main_cb routine containing all the commands to run. * @param main_cb routine containing all the commands to run.
* @param main_cb_cls closure for @a main_cb, typically NULL. * @param main_cb_cls closure for @a main_cb, typically NULL.
* @param config_file configuration file for the test-suite. * @param config_file configuration file for the test-suite.
*
* @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise. * @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise.
* non-#GNUNET_OK codes are #GNUNET_SYSERR most of the * non-#GNUNET_OK codes are #GNUNET_SYSERR most of the
* time. * time.
@ -691,11 +690,11 @@ TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb,
}; };
int result; int result;
if (GNUNET_OK != result =
(result = GNUNET_CONFIGURATION_parse_and_run (config_filename, GNUNET_CONFIGURATION_parse_and_run (config_filename,
& &TALER_TESTING_setup_with_exchange_cfg,
TALER_TESTING_setup_with_exchange_cfg, &setup_ctx);
&setup_ctx))) if (GNUNET_OK != result)
return result; return result;
return GNUNET_OK; return GNUNET_OK;
} }