summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-06-13 20:49:04 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-06-13 20:50:05 +0530
commit4f5df0c9e377f61d08ea2c496a764533dd82229f (patch)
tree5e9fcbc487b5fabee91e6a019c522fe581d380ed /src
parent1039a1c2f472155c88fca3d69a7a226c6c4a8d1c (diff)
downloadexchange-4f5df0c9e377f61d08ea2c496a764533dd82229f.tar.gz
exchange-4f5df0c9e377f61d08ea2c496a764533dd82229f.tar.bz2
exchange-4f5df0c9e377f61d08ea2c496a764533dd82229f.zip
bank API test: make payto URI use receiver-name, according to standard
Diffstat (limited to 'src')
-rw-r--r--src/testing/test_bank_api_nexus.conf2
-rw-r--r--src/testing/testing_api_helpers_bank.c30
2 files changed, 19 insertions, 13 deletions
diff --git a/src/testing/test_bank_api_nexus.conf b/src/testing/test_bank_api_nexus.conf
index 14d287a7..a437180f 100644
--- a/src/testing/test_bank_api_nexus.conf
+++ b/src/testing/test_bank_api_nexus.conf
@@ -4,7 +4,7 @@
currency = KUDOS
[exchange-account-2]
-PAYTO_URI = payto://iban/BIC/ES9121000418450200051332?name=Exchange
+PAYTO_URI = payto://iban/BIC/ES9121000418450200051332?receiver-name=Exchange
METHOD = iban
WIRE_GATEWAY_URL = http://localhost:5001/facades/my-facade/taler/
WIRE_GATEWAY_AUTH_METHOD = basic
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c
index c2e9f0a9..11cc4393 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -119,14 +119,14 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
char *curl_check_cmd;
nexus_proc = GNUNET_OS_start_process
- (GNUNET_NO,
- GNUNET_OS_INHERIT_STD_NONE,
- NULL, NULL, NULL,
- "nexus",
- "nexus",
- "serve",
- "--db-name", "/tmp/nexus-exchange-test.sqlite3",
- NULL);
+ (GNUNET_NO,
+ GNUNET_OS_INHERIT_STD_NONE,
+ NULL, NULL, NULL,
+ "nexus",
+ "nexus",
+ "serve",
+ "--db-name", "/tmp/nexus-exchange-test.sqlite3",
+ NULL);
if (NULL == nexus_proc)
{
GNUNET_break (0);
@@ -165,7 +165,7 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
fprintf (stderr, "\n");
sandbox_proc = GNUNET_OS_start_process
- (GNUNET_NO,
+ (GNUNET_NO,
GNUNET_OS_INHERIT_STD_NONE,
NULL, NULL, NULL,
"sandbox",
@@ -222,6 +222,7 @@ TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
return ret;
}
+
/**
* Start the (Python) bank process. Assume the port
* is available and the database is clean. Use the "prepare
@@ -338,6 +339,7 @@ TALER_TESTING_run_bank (const char *config_filename,
}
+
/**
* Prepare the Nexus execution. Check if the port is available
* and delete old database.
@@ -414,7 +416,8 @@ TALER_TESTING_prepare_nexus (const char *config_filename,
/* DB preparation */
if (GNUNET_YES == reset_db)
{
- if (0 != system ("rm -f /tmp/nexus-exchange-test.sqlite3 && rm -f /tmp/sandbox-exchange-test.sqlite3"))
+ if (0 != system (
+ "rm -f /tmp/nexus-exchange-test.sqlite3 && rm -f /tmp/sandbox-exchange-test.sqlite3"))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to invoke db-removal command.\n");
@@ -435,8 +438,10 @@ TALER_TESTING_prepare_nexus (const char *config_filename,
}
GNUNET_CONFIGURATION_destroy (cfg);
bc->exchange_payto = exchange_payto_uri;
- bc->user42_payto = "payto://iban/BIC/FR7630006000011234567890189?name=User42";
- bc->user43_payto = "payto://iban/BIC/GB33BUKB20201555555555?name=User43";
+ bc->user42_payto =
+ "payto://iban/BIC/FR7630006000011234567890189?receiver-name=User42";
+ bc->user43_payto =
+ "payto://iban/BIC/GB33BUKB20201555555555?receiver-name=User43";
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Relying on nexus %s on port %u\n",
bc->exchange_auth.wire_gateway_url,
@@ -450,6 +455,7 @@ TALER_TESTING_prepare_nexus (const char *config_filename,
return GNUNET_OK;
}
+
/**
* Prepare the bank execution. Check if the port is available
* and reset database.