[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated (08a44798 -> 22bd615f)
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated (08a44798 -> 22bd615f) |
|
Date: |
Sat, 18 Jan 2020 04:10:07 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository exchange.
from 08a44798 small steps towards removing hard-coded exchange account
new add346eb remove redundant bank_url field
new 22bd615f remove redundant exchange_account_url
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/include/taler_testing_lib.h | 12 ------------
src/lib/test_auditor_api.c | 4 ++--
src/lib/test_bank_api.c | 21 +++++++++++----------
src/lib/test_bank_api_twisted.c | 5 +++--
src/lib/test_exchange_api.c | 4 ++--
src/lib/test_exchange_api_revocation.c | 4 ++--
src/lib/test_exchange_api_twisted.c | 4 ++--
src/lib/test_taler_exchange_aggregator.c | 2 +-
src/lib/test_taler_exchange_wirewatch.c | 4 ++--
src/lib/testing_api_helpers_bank.c | 14 +++-----------
10 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 2631d581..781f1b13 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -268,18 +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.
- *
- * FIXME: remove? This duplicates exchange_auth.wire_gateway_url!
- */
- char *exchange_account_url;
/**
* Authentication data for the exchange user at the bank.
diff --git a/src/lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index f333c689..0b3e97f6 100644
--- a/src/lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
@@ -82,7 +82,7 @@ static struct TALER_TESTING_BankConfiguration bc;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- bc.exchange_account_url, \
+ bc.exchange_auth.wire_gateway_url, \
&bc.exchange_auth, \
bc.user42_payto)
@@ -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..bbb957bd 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -69,40 +69,40 @@ run (void *cls,
{
struct TALER_TESTING_Command commands[] = {
TALER_TESTING_cmd_bank_credits ("history-0",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
1),
TALER_TESTING_cmd_admin_add_incoming ("credit-1",
"KUDOS:5.01",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_bank_credits ("history-1c",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
TALER_TESTING_cmd_bank_debits ("history-1d",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
TALER_TESTING_cmd_admin_add_incoming ("credit-2",
"KUDOS:3.21",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_transfer ("debit-1",
"KUDOS:3.22",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.exchange_payto,
bc.user42_payto,
&wtid,
"http://exchange.example.com/";),
TALER_TESTING_cmd_bank_debits ("history-2b",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
@@ -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..e756f157 100644
--- a/src/lib/test_exchange_api.c
+++ b/src/lib/test_exchange_api.c
@@ -82,7 +82,7 @@ static struct TALER_TESTING_BankConfiguration bc;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- bc.exchange_account_url, \
+ bc.exchange_auth.wire_gateway_url,
\
&bc.exchange_auth, \
bc.user42_payto)
@@ -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..d04bf9f8 100644
--- a/src/lib/test_exchange_api_revocation.c
+++ b/src/lib/test_exchange_api_revocation.c
@@ -68,7 +68,7 @@ run (void *cls,
*/
TALER_TESTING_cmd_admin_add_incoming ("create-reserve-1",
"EUR:5.01",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1",
@@ -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..831273c3 100644
--- a/src/lib/test_exchange_api_twisted.c
+++ b/src/lib/test_exchange_api_twisted.c
@@ -91,7 +91,7 @@ static struct GNUNET_OS_Process *twisterd;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- bc.exchange_account_url, \
+ bc.exchange_auth.wire_gateway_url, \
&bc.exchange_auth, \
bc.user42_payto)
@@ -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..df71c10c 100644
--- a/src/lib/test_taler_exchange_wirewatch.c
+++ b/src/lib/test_taler_exchange_wirewatch.c
@@ -54,7 +54,7 @@ transfer_to_exchange (const char *label,
{
return TALER_TESTING_cmd_admin_add_incoming (label,
amount,
- bc.exchange_account_url,
+
bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto);
}
@@ -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..cdb69093 100644
--- a/src/lib/testing_api_helpers_bank.c
+++ b/src/lib/testing_api_helpers_bank.c
@@ -361,8 +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";
bc->user43_payto = "payto://x-taler-bank/localhost/43";
@@ -451,19 +449,13 @@ 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 */
- bc->exchange_account_url = GNUNET_strdup
(bc->exchange_auth.wire_gateway_url);
- GNUNET_assert (NULL != bc->exchange_account_url);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "fakebank account URL: %s\n",
- bc->exchange_account_url);
/* Now we know it's the fake bank, for purpose of authentication, we
* don't have any auth. */
bc->exchange_auth.method = TALER_BANK_AUTH_NONE;
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-exchange] branch master updated (08a44798 -> 22bd615f),
gnunet <=