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

actually loading config

Browse Source
This commit is contained in:
Marcello Stanisci 2018-02-21 12:41:22 +01:00
parent 377f35fd7d
commit 3c9757a163
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
2 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/exchange-lib/testing_api_cmd_fakebank_transfer.c
View File

@ -219,6 +219,16 @@ fakebank_transfer_run (void *cls,
struct GNUNET_CRYPTO_EddsaPrivateKey *priv; struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CONFIGURATION_Handle *cfg;
cfg = GNUNET_CONFIGURATION_create (); cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK !=
GNUNET_CONFIGURATION_load (cfg,
fts->config_filename))
{
GNUNET_break (0);
TALER_TESTING_interpreter_fail (is);
return;
}
GNUNET_asprintf (&section, GNUNET_asprintf (&section,
"merchant-instance-%s", "merchant-instance-%s",
fts->instance); fts->instance);

74
src/exchange-lib/testing_api_helpers.c
View File

@ -2,16 +2,18 @@
This file is part of TALER This file is part of TALER
Copyright (C) 2018 Taler Systems SA Copyright (C) 2018 Taler Systems SA
TALER is free software; you can redistribute it and/or modify it under the TALER is free software; you can redistribute it and/or modify
terms of the GNU General Public License as published by the Free Software it under the terms of the GNU General Public License as
Foundation; either version 3, or (at your option) any later version. published by the Free Software Foundation; either version 3, or
(at your option) any later version.
TALER is distributed in the hope that it will be useful, but WITHOUT ANY TALER is distributed in the hope that it will be useful, but
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR WITHOUT ANY WARRANTY; without even the implied warranty of
A PARTICULAR PURPOSE. See the GNU General Public License for more details. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with You should have received a copy of the GNU General Public
TALER; see the file COPYING. If not, see License along with TALER; see the file COPYING. If not, see
<http://www.gnu.org/licenses/> <http://www.gnu.org/licenses/>
*/ */
/** /**
@ -49,10 +51,11 @@ TALER_TESTING_cleanup_files (const char *config_name)
exit (77); exit (77);
} }
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_filename (cfg, GNUNET_CONFIGURATION_get_value_filename
"exchange", (cfg,
"keydir", "exchange",
&dir)); "keydir",
&dir));
if (GNUNET_YES == if (GNUNET_YES ==
GNUNET_DISK_directory_test (dir, GNUNET_DISK_directory_test (dir,
GNUNET_NO)) GNUNET_NO))
@ -70,8 +73,8 @@ TALER_TESTING_cleanup_files (const char *config_name)
* launch the exchange process itself. * launch the exchange process itself.
* *
* @param config_filename configuration file to use * @param config_filename configuration file to use
* @return #GNUNET_OK on success, #GNUNET_NO if test should be skipped, * @return #GNUNET_OK on success, #GNUNET_NO if test should be
* #GNUNET_SYSERR on test failure * skipped, #GNUNET_SYSERR on test failure
*/ */
int int
TALER_TESTING_prepare_exchange (const char *config_filename) TALER_TESTING_prepare_exchange (const char *config_filename)
@ -95,7 +98,8 @@ TALER_TESTING_prepare_exchange (const char *config_filename)
if (NULL == proc) if (NULL == proc)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to run `taler-exchange-keyup`, is your PATH correct?\n"); "Failed to run `taler-exchange-keyup`,"
" is your PATH correct?\n");
return GNUNET_NO; return GNUNET_NO;
} }
GNUNET_OS_process_wait (proc); GNUNET_OS_process_wait (proc);
@ -152,7 +156,8 @@ TALER_TESTING_prepare_exchange (const char *config_filename)
if (NULL == proc) if (NULL == proc)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to run `taler-auditor-sign`, is your PATH correct?\n"); "Failed to run `taler-auditor-sign`,"
" is your PATH correct?\n");
return GNUNET_NO; return GNUNET_NO;
} }
GNUNET_OS_process_wait (proc); GNUNET_OS_process_wait (proc);
@ -169,7 +174,8 @@ TALER_TESTING_prepare_exchange (const char *config_filename)
if (NULL == proc) if (NULL == proc)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to run `taler-exchange-dbinit`, is your PATH correct?\n"); "Failed to run `taler-exchange-dbinit`,"
" is your PATH correct?\n");
return GNUNET_NO; return GNUNET_NO;
} }
if (GNUNET_SYSERR == if (GNUNET_SYSERR ==
@ -193,7 +199,8 @@ TALER_TESTING_prepare_exchange (const char *config_filename)
(0 != code) ) (0 != code) )
{ {
fprintf (stderr, fprintf (stderr,
"Unexpected error running `taler-exchange-dbinit'!\n"); "Unexpected error running"
" `taler-exchange-dbinit'!\n");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
return GNUNET_OK; return GNUNET_OK;
@ -222,10 +229,12 @@ TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys *keys,
if ( (0 == TALER_amount_cmp (amount, if ( (0 == TALER_amount_cmp (amount,
&pk->value)) && &pk->value)) &&
(now.abs_value_us >= pk->valid_from.abs_value_us) && (now.abs_value_us >= pk->valid_from.abs_value_us) &&
(now.abs_value_us < pk->withdraw_valid_until.abs_value_us) ) (now.abs_value_us <
pk->withdraw_valid_until.abs_value_us) )
return pk; return pk;
} }
/* do 2nd pass to check if expiration times are to blame for failure */ /* do 2nd pass to check if expiration times are to blame for
* failure */
str = TALER_amount_to_string (amount); str = TALER_amount_to_string (amount);
for (unsigned int i=0;i<keys->num_denom_keys;i++) for (unsigned int i=0;i<keys->num_denom_keys;i++)
{ {
@ -233,14 +242,18 @@ TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys *keys,
if ( (0 == TALER_amount_cmp (amount, if ( (0 == TALER_amount_cmp (amount,
&pk->value)) && &pk->value)) &&
( (now.abs_value_us < pk->valid_from.abs_value_us) || ( (now.abs_value_us < pk->valid_from.abs_value_us) ||
(now.abs_value_us > pk->withdraw_valid_until.abs_value_us) ) ) (now.abs_value_us >
pk->withdraw_valid_until.abs_value_us) ) )
{ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, GNUNET_log
"Have denomination key for `%s', but with wrong expiration range %llu vs [%llu,%llu)\n", (GNUNET_ERROR_TYPE_WARNING,
str, "Have denomination key for `%s', but with wrong"
(unsigned long long) now.abs_value_us, " expiration range %llu vs [%llu,%llu)\n",
(unsigned long long) pk->valid_from.abs_value_us, str,
(unsigned long long) pk->withdraw_valid_until.abs_value_us); (unsigned long long) now.abs_value_us,
(unsigned long long) pk->valid_from.abs_value_us,
(unsigned long long)
pk->withdraw_valid_until.abs_value_us);
GNUNET_free (str); GNUNET_free (str);
return NULL; return NULL;
} }
@ -322,7 +335,8 @@ TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb,
if (10 == iter) if (10 == iter)
{ {
fprintf (stderr, fprintf (stderr,
"Failed to launch `taler-exchange-httpd' (or `wget')\n"); "Failed to launch `taler-exchange-httpd'"
" (or `wget')\n");
GNUNET_OS_process_kill (exchanged, GNUNET_OS_process_kill (exchanged,
SIGTERM); SIGTERM);
GNUNET_OS_process_wait (exchanged); GNUNET_OS_process_wait (exchanged);
@ -333,7 +347,9 @@ TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb,
sleep (1); sleep (1);
iter++; iter++;
} }
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/keys -o /dev/null -O /dev/null")); while (0 != system
("wget -q -t 1 -T 1 http://127.0.0.1:8081/keys"
" -o /dev/null -O /dev/null"));
fprintf (stderr, "\n"); fprintf (stderr, "\n");
result = TALER_TESTING_setup (main_cb, result = TALER_TESTING_setup (main_cb,