diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-06-20 18:03:33 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-06-20 18:03:33 +0200 |
| commit | b2c046a3f65f823ff6fbfef4f9c96e876aed56dc (patch) | |
| tree | ab49fe78655d416004957f7b247a681758b1dafc /src/testing | |
| parent | 9e39308104794e7f1df4941db3d3e527b47ba15c (diff) | |
| download | anastasis-b2c046a3f65f823ff6fbfef4f9c96e876aed56dc.tar.gz anastasis-b2c046a3f65f823ff6fbfef4f9c96e876aed56dc.tar.bz2 anastasis-b2c046a3f65f823ff6fbfef4f9c96e876aed56dc.zip | |
-get rid of GNUNET_SPEC_spec_json calls
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/test_anastasis.c | 12 | ||||
| -rw-r--r-- | src/testing/test_anastasis_api.c | 12 | ||||
| -rw-r--r-- | src/testing/test_anastasis_api.conf | 7 | ||||
| -rw-r--r-- | src/testing/testing_cmd_recover_secret.c | 2 |
4 files changed, 25 insertions, 8 deletions
diff --git a/src/testing/test_anastasis.c b/src/testing/test_anastasis.c index f9e8531..e3eec24 100644 --- a/src/testing/test_anastasis.c +++ b/src/testing/test_anastasis.c @@ -369,9 +369,15 @@ main (int argc, dir); } id_data = ANASTASIS_TESTING_make_id_data_example ("MaxMuster123456789"); - payer_payto = "payto://x-taler-bank/localhost/" USER_ACCOUNT_NAME; - exchange_payto = "payto://x-taler-bank/localhost/" EXCHANGE_ACCOUNT_NAME; - merchant_payto = "payto://x-taler-bank/localhost/" MERCHANT_ACCOUNT_NAME; + payer_payto = + "payto://x-taler-bank/localhost/" USER_ACCOUNT_NAME + "?receiver-name=62"; + exchange_payto = + "payto://x-taler-bank/localhost/" EXCHANGE_ACCOUNT_NAME + "?receiver-name=exchange"; + merchant_payto = + "payto://x-taler-bank/localhost/" MERCHANT_ACCOUNT_NAME + "?receiver-name=merchant"; merchant_url = "http://localhost:8080/"; if (NULL == diff --git a/src/testing/test_anastasis_api.c b/src/testing/test_anastasis_api.c index 04071c9..cdf8f54 100644 --- a/src/testing/test_anastasis_api.c +++ b/src/testing/test_anastasis_api.c @@ -322,9 +322,15 @@ main (int argc, "%s/.secret", dir); } - payer_payto = "payto://x-taler-bank/localhost/" USER_ACCOUNT_NAME; - exchange_payto = "payto://x-taler-bank/localhost/" EXCHANGE_ACCOUNT_NAME; - merchant_payto = "payto://x-taler-bank/localhost/" MERCHANT_ACCOUNT_NAME; + payer_payto = + "payto://x-taler-bank/localhost/" USER_ACCOUNT_NAME + "?receiver-name=62"; + exchange_payto = + "payto://x-taler-bank/localhost/" EXCHANGE_ACCOUNT_NAME + "?receiver-name=exchange"; + merchant_payto = + "payto://x-taler-bank/localhost/" MERCHANT_ACCOUNT_NAME + "?receiver-name=merchant"; merchant_url = "http://localhost:8080/"; if (NULL == diff --git a/src/testing/test_anastasis_api.conf b/src/testing/test_anastasis_api.conf index 3b2f976..db2c30c 100644 --- a/src/testing/test_anastasis_api.conf +++ b/src/testing/test_anastasis_api.conf @@ -2,6 +2,11 @@ # [PATHS] TALER_TEST_HOME = test_anastasis_api_home/ +TALER_HOME = ${TALER_TEST_HOME:-${HOME:-${USERPROFILE}}} +TALER_DATA_HOME = ${TALER_TEST_HOME:-${XDG_DATA_HOME:-${TALER_HOME}/.local/share/}/.local/share/}taler/ +TALER_CONFIG_HOME = ${TALER_TEST_HOME:-${XDG_CONFIG_HOME:-${TALER_HOME}/.config/}/.config/}taler/ +TALER_CACHE_HOME = ${TALER_TEST_HOME:-${XDG_CACHE_HOME:-${TALER_HOME}/.cache/}/.cache/}taler/ +TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-system-runtime/ [taler] CURRENCY = EUR @@ -94,7 +99,7 @@ KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-cs/keys CONFIG = "postgres:///talercheck" [exchange-account-exchange] -PAYTO_URI = "payto://x-taler-bank/localhost:8082/2" +PAYTO_URI = "payto://x-taler-bank/localhost:8082/2?receiver-name=exchange" ENABLE_DEBIT = YES ENABLE_CREDIT = YES diff --git a/src/testing/testing_cmd_recover_secret.c b/src/testing/testing_cmd_recover_secret.c index 81f2d64..35a8580 100644 --- a/src/testing/testing_cmd_recover_secret.c +++ b/src/testing/testing_cmd_recover_secret.c @@ -302,7 +302,7 @@ recover_secret_cleanup (void *cls, * @param index index number of the object to extract. * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue recover_secret_traits (void *cls, const void **ret, const char *trait, |