[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] 03/08: fix post-merge FTBFS
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-exchange] 03/08: fix post-merge FTBFS |
Date: |
Sun, 15 Apr 2018 12:20:47 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 40a64e8f0c4da9d99f1352004b572052da1cecb7
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Apr 2 14:33:26 2018 +0200
fix post-merge FTBFS
---
src/bank-lib/bank_twisted.conf | 3 +++
src/bank-lib/test_bank_api_with_fakebank_twisted.c | 8 ++++----
src/exchange-lib/test_exchange_api_twisted.c | 3 ++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/bank-lib/bank_twisted.conf b/src/bank-lib/bank_twisted.conf
index 54e8c80..d20e109 100644
--- a/src/bank-lib/bank_twisted.conf
+++ b/src/bank-lib/bank_twisted.conf
@@ -29,5 +29,8 @@ currency = KUDOS
[bank]
http_port = 8081
+[account-1]
+URL = payto://x-taler-bank/localhost:8081/1
+
[exchange-wire-test]
bank_url = http://localhost:8081/
diff --git a/src/bank-lib/test_bank_api_with_fakebank_twisted.c
b/src/bank-lib/test_bank_api_with_fakebank_twisted.c
index 6465c03..4e49110 100644
--- a/src/bank-lib/test_bank_api_with_fakebank_twisted.c
+++ b/src/bank-lib/test_bank_api_with_fakebank_twisted.c
@@ -75,9 +75,7 @@ static void
run (void *cls,
struct TALER_TESTING_Interpreter *is)
{
-
struct TALER_TESTING_Command commands[] = {
-
TALER_TESTING_cmd_bank_history ("history-0",
fakebank_url,
EXCHANGE_ACCOUNT_NUMBER,
@@ -110,6 +108,7 @@ purge_process (struct GNUNET_OS_Process *process)
GNUNET_OS_process_destroy (process);
}
+
int
main (int argc,
char * const *argv)
@@ -122,13 +121,14 @@ main (int argc,
"DEBUG", NULL);
if (NULL == (fakebank_url = TALER_TESTING_prepare_fakebank
- (CONFIG_FILE)))
+ (CONFIG_FILE,
+ "account-1")))
return 77;
if (NULL == (twister_url = TALER_TESTING_prepare_twister
(CONFIG_FILE)))
return 77;
-
+
if (NULL == (twisterd = TALER_TESTING_run_twister (CONFIG_FILE)))
return 77;
diff --git a/src/exchange-lib/test_exchange_api_twisted.c
b/src/exchange-lib/test_exchange_api_twisted.c
index 6032417..1e3aa34 100644
--- a/src/exchange-lib/test_exchange_api_twisted.c
+++ b/src/exchange-lib/test_exchange_api_twisted.c
@@ -179,7 +179,8 @@ main (int argc,
"DEBUG", NULL);
if (NULL == (fakebank_url = TALER_TESTING_prepare_fakebank
- (CONFIG_FILE)))
+ (CONFIG_FILE,
+ "account-2")))
return 77;
if (NULL == (twister_url = TALER_TESTING_prepare_twister
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-exchange] branch master updated (1b3bf1a -> 202827e), gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 06/08: report which command failed, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 04/08: fix NULL termination of fee list, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 05/08: get filename instead of get_string, nicify some strings, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 08/08: merging Florian's changes with my wire changes, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 03/08: fix post-merge FTBFS,
gnunet <=
- [GNUnet-SVN] [taler-exchange] 01/08: modify wire plugin load logic to use reference counting, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 07/08: allow auditor to operate per-account, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-exchange] 02/08: Changing configuration structure to enable multiple accounts., gnunet, 2018/04/15