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

-remove pybank remenants

Browse Source
This commit is contained in:
Christian Grothoff 2023-01-11 15:47:58 +01:00
parent 973c671679
commit 4dc7775ec4
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 12 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/testing/test_bank_api.c
View File

@ -34,7 +34,6 @@
#include "taler_testing_lib.h" #include "taler_testing_lib.h"
#define CONFIG_FILE_FAKEBANK "test_bank_api_fakebank.conf" #define CONFIG_FILE_FAKEBANK "test_bank_api_fakebank.conf"
#define CONFIG_FILE_PYBANK "test_bank_api_pybank.conf"
#define CONFIG_FILE_NEXUS "test_bank_api_nexus.conf" #define CONFIG_FILE_NEXUS "test_bank_api_nexus.conf"
@ -206,29 +205,6 @@ main (int argc,
return 77; return 77;
} }
} }
else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
"_with_pybank"))
{
TALER_LOG_DEBUG ("Running against the Pybank.\n");
cfgfile = CONFIG_FILE_PYBANK;
if (GNUNET_OK !=
TALER_TESTING_prepare_bank (CONFIG_FILE_PYBANK,
GNUNET_YES,
"exchange-account-2",
&bc))
{
GNUNET_break (0);
return 77;
}
if (NULL == (bankd = TALER_TESTING_run_bank (
CONFIG_FILE_PYBANK,
bc.exchange_auth.wire_gateway_url)))
{
GNUNET_break (0);
return 77;
}
}
else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0], else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
"_with_nexus")) "_with_nexus"))
{ {
@ -263,29 +239,17 @@ main (int argc,
else else
rv = 0; rv = 0;
if (GNUNET_NO == with_fakebank) if (with_libeufin)
{ {
// -> pybank GNUNET_OS_process_kill (libeufin_services.nexus,
if (GNUNET_NO == with_libeufin) SIGKILL);
{ GNUNET_OS_process_wait (libeufin_services.nexus);
GNUNET_OS_process_destroy (libeufin_services.nexus);
GNUNET_OS_process_kill (bankd, GNUNET_OS_process_kill (libeufin_services.sandbox,
SIGKILL); SIGKILL);
GNUNET_OS_process_wait (bankd); GNUNET_OS_process_wait (libeufin_services.sandbox);
GNUNET_OS_process_destroy (bankd); GNUNET_OS_process_destroy (libeufin_services.sandbox);
}
else // -> libeufin
{
GNUNET_OS_process_kill (libeufin_services.nexus,
SIGKILL);
GNUNET_OS_process_wait (libeufin_services.nexus);
GNUNET_OS_process_destroy (libeufin_services.nexus);
GNUNET_OS_process_kill (libeufin_services.sandbox,
SIGKILL);
GNUNET_OS_process_wait (libeufin_services.sandbox);
GNUNET_OS_process_destroy (libeufin_services.sandbox);
}
} }
return rv; return rv;

29
src/testing/test_bank_api_twisted.c
View File

@ -41,11 +41,6 @@
*/ */
#define CONFIG_FILE_FAKEBANK "test_bank_api_fakebank_twisted.conf" #define CONFIG_FILE_FAKEBANK "test_bank_api_fakebank_twisted.conf"
/**
* Separate config file for running with the pybank.
*/
#define CONFIG_FILE_PYBANK "test_bank_api_pybank_twisted.conf"
/** /**
* True when the test runs against Fakebank. * True when the test runs against Fakebank.
*/ */
@ -180,8 +175,7 @@ main (int argc,
if (with_fakebank) if (with_fakebank)
cfgfilename = CONFIG_FILE_FAKEBANK; cfgfilename = CONFIG_FILE_FAKEBANK;
else else
cfgfilename = CONFIG_FILE_PYBANK; GNUNET_assert (0);
if (NULL == (twister_url = TALER_TWISTER_prepare_twister ( if (NULL == (twister_url = TALER_TWISTER_prepare_twister (
cfgfilename))) cfgfilename)))
{ {
@ -212,26 +206,7 @@ main (int argc,
} }
else else
{ {
TALER_LOG_DEBUG ("Running against the Pybank.\n"); GNUNET_assert (0);
if (GNUNET_OK !=
TALER_TESTING_prepare_bank (cfgfilename,
GNUNET_YES,
"exchange-account-2",
&bc))
{
GNUNET_break (0);
GNUNET_free (twister_url);
return 77;
}
if (NULL == (bankd = TALER_TESTING_run_bank (
cfgfilename,
bc.exchange_auth.wire_gateway_url)))
{
GNUNET_break (0);
GNUNET_free (twister_url);
return 77;
}
} }
sleep (5); sleep (5);

2
src/testing/testing_api_helpers_bank.c
View File

@ -582,7 +582,7 @@ TALER_TESTING_prepare_bank (const char *config_filename,
bc->user42_payto = "payto://x-taler-bank/localhost/42?receiver-name=42"; bc->user42_payto = "payto://x-taler-bank/localhost/42?receiver-name=42";
bc->user43_payto = "payto://x-taler-bank/localhost/43?receiver-name=43"; bc->user43_payto = "payto://x-taler-bank/localhost/43?receiver-name=43";
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Using pybank %s on port %u\n", "Using bank %s on port %u\n",
bc->exchange_auth.wire_gateway_url, bc->exchange_auth.wire_gateway_url,
(unsigned int) port); (unsigned int) port);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,