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

reset auditor tables upon running tests, + upgrade "twisted" config file.

Browse Source
This commit is contained in:
Marcello Stanisci 2018-04-23 17:20:14 +02:00
parent eedb4dd4ed
commit a9ff9a0bbe
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
2 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/exchange-lib/test_exchange_api_twisted.conf
View File

@ -130,6 +130,40 @@ BANK_URL = "http://localhost:8082/"
# From which account at the 'bank' should outgoing wire transfers be made? # From which account at the 'bank' should outgoing wire transfers be made?
BANK_ACCOUNT_NUMBER = 2 BANK_ACCOUNT_NUMBER = 2
[account-2]
URL = payto://x-taler-bank/localhost:8082/2
PLUGIN = taler_bank
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json
TALER_BANK_AUTH_METHOD = "basic"
USERNAME = user
PASSWORD = pass
ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[fees-x-taler-bank]
# Fees for the forseeable future...
# If you see this after 2017, update to match the next 10 years...
WIRE-FEE-2018 = EUR:0.01
WIRE-FEE-2019 = EUR:0.01
WIRE-FEE-2020 = EUR:0.01
WIRE-FEE-2021 = EUR:0.01
WIRE-FEE-2022 = EUR:0.01
WIRE-FEE-2023 = EUR:0.01
WIRE-FEE-2024 = EUR:0.01
WIRE-FEE-2025 = EUR:0.01
WIRE-FEE-2026 = EUR:0.01
WIRE-FEE-2027 = EUR:0.01
CLOSING-FEE-2018 = EUR:0.01
CLOSING-FEE-2019 = EUR:0.01
CLOSING-FEE-2020 = EUR:0.01
CLOSING-FEE-2021 = EUR:0.01
CLOSING-FEE-2022 = EUR:0.01
CLOSING-FEE-2023 = EUR:0.01
CLOSING-FEE-2024 = EUR:0.01
CLOSING-FEE-2025 = EUR:0.01
CLOSING-FEE-2026 = EUR:0.01
CLOSING-FEE-2027 = EUR:0.01
[coin_eur_ct_1] [coin_eur_ct_1]
value = EUR:0.01 value = EUR:0.01

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

@ -185,6 +185,7 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
GNUNET_OS_process_wait (proc); GNUNET_OS_process_wait (proc);
GNUNET_OS_process_destroy (proc); GNUNET_OS_process_destroy (proc);
/* Reset exchange database. */
proc = GNUNET_OS_start_process (GNUNET_NO, proc = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL, GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL, NULL, NULL, NULL,
@ -215,7 +216,7 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
(0 != code) ) (0 != code) )
{ {
fprintf (stderr, fprintf (stderr,
"Failed to setup database\n"); "Failed to setup (exchange) database\n");
return GNUNET_NO; return GNUNET_NO;
} }
if ( (type != GNUNET_OS_PROCESS_EXITED) || if ( (type != GNUNET_OS_PROCESS_EXITED) ||
@ -227,6 +228,51 @@ TALER_TESTING_prepare_exchange (const char *config_filename,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
/* Reset auditor database. */
proc = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
"taler-auditor-dbinit",
"taler-auditor-dbinit",
"-c", config_filename,
"-r",
NULL);
if (NULL == proc)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to run `taler-auditor-dbinit`,"
" is your PATH correct?\n");
return GNUNET_NO;
}
if (GNUNET_SYSERR ==
GNUNET_OS_process_wait_status (proc,
&type,
&code))
{
GNUNET_break (0);
GNUNET_OS_process_destroy (proc);
return GNUNET_SYSERR;
}
GNUNET_OS_process_destroy (proc);
if ( (type == GNUNET_OS_PROCESS_EXITED) &&
(0 != code) )
{
fprintf (stderr,
"Failed to setup (auditor) database\n");
return GNUNET_NO;
}
if ( (type != GNUNET_OS_PROCESS_EXITED) ||
(0 != code) )
{
fprintf (stderr,
"Unexpected error running"
" `taler-auditor-dbinit'!\n");
return GNUNET_SYSERR;
}
return GNUNET_OK; return GNUNET_OK;
} }