[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: -remove pybank remenants
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: -remove pybank remenants |
Date: |
Wed, 11 Jan 2023 15:48:07 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 4dc7775e -remove pybank remenants
new b6f9f004 Merge branch 'master' of git+ssh://git.taler.net/exchange
4dc7775e is described below
commit 4dc7775ec4300c58bc6a0f637387659e1f8c4dfb
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jan 11 15:47:58 2023 +0100
-remove pybank remenants
---
src/testing/test_bank_api.c | 54 ++++++----------------------------
src/testing/test_bank_api_twisted.c | 29 ++----------------
src/testing/testing_api_helpers_bank.c | 2 +-
3 files changed, 12 insertions(+), 73 deletions(-)
diff --git a/src/testing/test_bank_api.c b/src/testing/test_bank_api.c
index ca794d27..619fb30b 100644
--- a/src/testing/test_bank_api.c
+++ b/src/testing/test_bank_api.c
@@ -34,7 +34,6 @@
#include "taler_testing_lib.h"
#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"
@@ -206,29 +205,6 @@ main (int argc,
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],
"_with_nexus"))
{
@@ -263,29 +239,17 @@ main (int argc,
else
rv = 0;
- if (GNUNET_NO == with_fakebank)
+ if (with_libeufin)
{
- // -> pybank
- if (GNUNET_NO == with_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 (bankd,
- SIGKILL);
- GNUNET_OS_process_wait (bankd);
- GNUNET_OS_process_destroy (bankd);
- }
- 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);
- }
+ GNUNET_OS_process_kill (libeufin_services.sandbox,
+ SIGKILL);
+ GNUNET_OS_process_wait (libeufin_services.sandbox);
+ GNUNET_OS_process_destroy (libeufin_services.sandbox);
}
return rv;
diff --git a/src/testing/test_bank_api_twisted.c
b/src/testing/test_bank_api_twisted.c
index 70ad102f..80629b6f 100644
--- a/src/testing/test_bank_api_twisted.c
+++ b/src/testing/test_bank_api_twisted.c
@@ -41,11 +41,6 @@
*/
#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.
*/
@@ -180,8 +175,7 @@ main (int argc,
if (with_fakebank)
cfgfilename = CONFIG_FILE_FAKEBANK;
else
- cfgfilename = CONFIG_FILE_PYBANK;
-
+ GNUNET_assert (0);
if (NULL == (twister_url = TALER_TWISTER_prepare_twister (
cfgfilename)))
{
@@ -212,26 +206,7 @@ main (int argc,
}
else
{
- TALER_LOG_DEBUG ("Running against the Pybank.\n");
- 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;
- }
+ GNUNET_assert (0);
}
sleep (5);
diff --git a/src/testing/testing_api_helpers_bank.c
b/src/testing/testing_api_helpers_bank.c
index eccd4572..df6d631e 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -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->user43_payto = "payto://x-taler-bank/localhost/43?receiver-name=43";
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,
(unsigned int) port);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: -remove pybank remenants,
gnunet <=