[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 01/02: remove redundant bank_url field
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 01/02: remove redundant bank_url field |
|
Date: |
Sat, 18 Jan 2020 04:10:08 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository exchange.
commit add346eb6cb88799ed89afbab5314f7aab44afbc
Author: Florian Dold <address@hidden>
AuthorDate: Sat Jan 18 04:00:35 2020 +0100
remove redundant bank_url field
---
src/include/taler_testing_lib.h | 5 -----
src/lib/test_auditor_api.c | 2 +-
src/lib/test_bank_api.c | 7 ++++---
src/lib/test_bank_api_twisted.c | 5 +++--
src/lib/test_exchange_api.c | 2 +-
src/lib/test_exchange_api_revocation.c | 2 +-
src/lib/test_exchange_api_twisted.c | 2 +-
src/lib/test_taler_exchange_aggregator.c | 2 +-
src/lib/test_taler_exchange_wirewatch.c | 2 +-
src/lib/testing_api_helpers_bank.c | 8 +++-----
10 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 2631d581..4426e65a 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -268,11 +268,6 @@ TALER_TESTING_url_port_free (const char *url);
*/
struct TALER_TESTING_BankConfiguration
{
- /**
- * Bank base URL.
- */
- char *bank_url;
-
/**
* Base URL of the exchange's bank account. Basically
* @e bank_url plus the exchange account.
diff --git a/src/lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index f333c689..0158a368 100644
--- a/src/lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
@@ -658,7 +658,7 @@ run (void *cls,
TALER_TESTING_run_with_fakebank (is,
commands,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
}
diff --git a/src/lib/test_bank_api.c b/src/lib/test_bank_api.c
index c6049c01..71a52c6a 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -111,11 +111,11 @@ run (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Bank serves at `%s'\n",
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
if (GNUNET_YES == with_fakebank)
TALER_TESTING_run_with_fakebank (is,
commands,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
else
TALER_TESTING_run (is,
commands);
@@ -165,7 +165,8 @@ main (int argc,
}
if (NULL == (bankd = TALER_TESTING_run_bank (CONFIG_FILE_PYBANK,
- bc.bank_url)))
+ bc.exchange_auth.
+ wire_gateway_url)))
{
GNUNET_break (0);
return 77;
diff --git a/src/lib/test_bank_api_twisted.c b/src/lib/test_bank_api_twisted.c
index a1452804..e0014880 100644
--- a/src/lib/test_bank_api_twisted.c
+++ b/src/lib/test_bank_api_twisted.c
@@ -101,7 +101,7 @@ run (void *cls,
if (GNUNET_YES == with_fakebank)
TALER_TESTING_run_with_fakebank (is,
commands,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
else
TALER_TESTING_run (is,
commands);
@@ -187,7 +187,8 @@ main (int argc,
}
if (NULL == (bankd = TALER_TESTING_run_bank (cfgfilename,
- bc.bank_url)))
+ bc.exchange_auth.
+ wire_gateway_url)))
{
GNUNET_break (0);
GNUNET_free (twister_url);
diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c
index b5dd7c89..1351ce8c 100644
--- a/src/lib/test_exchange_api.c
+++ b/src/lib/test_exchange_api.c
@@ -778,7 +778,7 @@ run (void *cls,
TALER_TESTING_run_with_fakebank (is,
commands,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
}
}
diff --git a/src/lib/test_exchange_api_revocation.c
b/src/lib/test_exchange_api_revocation.c
index 80fede12..1c980cf4 100644
--- a/src/lib/test_exchange_api_revocation.c
+++ b/src/lib/test_exchange_api_revocation.c
@@ -178,7 +178,7 @@ run (void *cls,
TALER_TESTING_run_with_fakebank (is,
revocation,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
}
diff --git a/src/lib/test_exchange_api_twisted.c
b/src/lib/test_exchange_api_twisted.c
index 072ae17d..71406bb5 100644
--- a/src/lib/test_exchange_api_twisted.c
+++ b/src/lib/test_exchange_api_twisted.c
@@ -259,7 +259,7 @@ run (void *cls,
TALER_TESTING_run_with_fakebank (is,
commands,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
}
diff --git a/src/lib/test_taler_exchange_aggregator.c
b/src/lib/test_taler_exchange_aggregator.c
index 25e9a423..347aeb46 100644
--- a/src/lib/test_taler_exchange_aggregator.c
+++ b/src/lib/test_taler_exchange_aggregator.c
@@ -450,7 +450,7 @@ run (void *cls,
TALER_TESTING_run_with_fakebank (is,
all,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
}
diff --git a/src/lib/test_taler_exchange_wirewatch.c
b/src/lib/test_taler_exchange_wirewatch.c
index 98346b4e..20aab59c 100644
--- a/src/lib/test_taler_exchange_wirewatch.c
+++ b/src/lib/test_taler_exchange_wirewatch.c
@@ -109,7 +109,7 @@ run (void *cls,
TALER_TESTING_run_with_fakebank (is,
all,
- bc.bank_url);
+ bc.exchange_auth.wire_gateway_url);
}
diff --git a/src/lib/testing_api_helpers_bank.c
b/src/lib/testing_api_helpers_bank.c
index 5fcc5022..c331cdeb 100644
--- a/src/lib/testing_api_helpers_bank.c
+++ b/src/lib/testing_api_helpers_bank.c
@@ -361,7 +361,6 @@ TALER_TESTING_prepare_bank (const char *config_filename,
return GNUNET_SYSERR;
}
GNUNET_CONFIGURATION_destroy (cfg);
- bc->bank_url = GNUNET_strdup (bc->exchange_auth.wire_gateway_url);
bc->exchange_account_url = GNUNET_strdup
(bc->exchange_auth.wire_gateway_url);
bc->exchange_payto = exchange_payto_uri;
bc->user42_payto = "payto://x-taler-bank/localhost/42";
@@ -451,12 +450,11 @@ TALER_TESTING_prepare_fakebank (const char
*config_filename,
(unsigned int) fakebank_port);
GNUNET_CONFIGURATION_destroy (cfg);
- bc->bank_url = GNUNET_strdup (bc->exchange_auth.wire_gateway_url);
if (GNUNET_OK !=
- TALER_TESTING_url_port_free (bc->bank_url))
+ TALER_TESTING_url_port_free (bc->exchange_auth.wire_gateway_url))
{
- GNUNET_free (bc->bank_url);
- bc->bank_url = NULL;
+ GNUNET_free (bc->exchange_auth.wire_gateway_url);
+ bc->exchange_auth.wire_gateway_url = NULL;
return GNUNET_SYSERR;
}
/* FIXME: this duplicates bc->exchange_auth.wire_gateway_url */
--
To stop receiving notification emails like this one, please contact
address@hidden.