exchange

commit eab454d8d278f497eaaed03bdd41dac0335a35c4
parent db47b512c1e56bc44c1dc0ecaeda1852d6a28d19
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue,  4 Aug 2026 23:11:45 +0200

fix inlining of setup.sh if /home/claude/.cargo/bin:/home/claude/.local/bin:/home/claude/bin:/home/claude/.npm-global/bin:/home/claude/target/bin/:/home/claude/bin:/home/claude/go/bin:/opt/rocm-7.2.1/bin/:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games does not contain .; add web_url where applicable

Diffstat:
M
src/bank-lib/fakebank_twg_transfer.c
 | 
2
+-
M
src/lib/exchange_api_common.c
 | 
4
++--
M
src/lib/exchange_api_handle.c
 | 
2
+-
M
src/lib/exchange_api_post-kyc-start-ID.c
 | 
2
+-
M
src/testing/meson.build
 | 
2
++
M
src/testing/test-sanctions.sh
 | 
5
++++-
M
src/testing/test_exchange_api.conf
 | 
2
+-
M
src/util/auditor-paths.conf
 | 
2
+-

8 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/bank-lib/fakebank_twg_transfer.c b/src/bank-lib/fakebank_twg_transfer.c
@@ -99,7 +99,7 @@ TALER_FAKEBANK_handle_transfer_ (
       TALER_JSON_spec_amount ("amount",
                               h->currency,
                               &amount),
-      GNUNET_JSON_spec_string ("exchange_base_url",
+      TALER_JSON_spec_web_url ("exchange_base_url",
                                &base_url),
       GNUNET_JSON_spec_fixed_auto ("wtid",
                                    &wtid),
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
@@ -540,11 +540,11 @@ TALER_EXCHANGE_parse_accounts (
                                  &conversion_url),
         NULL),
       GNUNET_JSON_spec_mark_optional (
-        GNUNET_JSON_spec_string ("open_banking_gateway",
+        TALER_JSON_spec_web_url ("open_banking_gateway",
                                  &open_banking_gateway),
         NULL),
       GNUNET_JSON_spec_mark_optional (
-        GNUNET_JSON_spec_string ("prepared_transfer_url",
+        TALER_JSON_spec_web_url ("prepared_transfer_url",
                                  &prepared_transfer_url),
         NULL),
       GNUNET_JSON_spec_mark_optional (
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
@@ -1035,7 +1035,7 @@ TALER_EXCHANGE_decode_keys_json_ (
           &wblwk),
         NULL),
       GNUNET_JSON_spec_mark_optional (
-        GNUNET_JSON_spec_string ("shopping_url",
+        TALER_JSON_spec_web_url ("shopping_url",
                                  &shopping_url),
         NULL),
       GNUNET_JSON_spec_mark_optional (
diff --git a/src/lib/exchange_api_post-kyc-start-ID.c b/src/lib/exchange_api_post-kyc-start-ID.c
@@ -105,7 +105,7 @@ handle_kyc_start_finished (void *cls,
   case MHD_HTTP_OK:
     {
       struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_string (
+        TALER_JSON_spec_web_url (
           "redirect_url",
           &adr.details.ok.redirect_url),
         GNUNET_JSON_spec_end ()
diff --git a/src/testing/meson.build b/src/testing/meson.build
@@ -886,6 +886,7 @@ test(
 
 EXTRA_DIST = [
     'valgrind.h',
+    'setup.sh',
     'coins-cs.conf',
     'coins-rsa.conf',
     'sanction-list.json',
@@ -914,6 +915,7 @@ EXTRA_DIST = [
     'test-taler-exchange-aggregator-postgres.conf',
     'test-taler-exchange-wirewatch-postgres.conf',
     'test_kyc_api.conf',
+    'test_sanctions.conf',
 ]
 
 foreach f : EXTRA_DIST
diff --git a/src/testing/test-sanctions.sh b/src/testing/test-sanctions.sh
@@ -42,7 +42,10 @@ echo -n "Testing for robocop "
 robocop -h > /dev/null 2> /dev/null || exit_skip "robocop required"
 echo "FOUND"
 
-. setup.sh
+# Source 'setup.sh' from the directory this script lives in; a bare
+# '. setup.sh' only works if the current working directory happens to
+# be that same directory.
+. "$(dirname "$0")/setup.sh"
 
 
 setup -c test_sanctions.conf \
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
@@ -10,7 +10,7 @@ TALER_EXCHANGE_CONFIG_HOME = ${XDG_CONFIG_HOME:-${TALER_HOME}/.config}/taler-exc
 TALER_AUDITOR_CONFIG_HOME = ${XDG_CONFIG_HOME:-${TALER_HOME}/.config}/taler-auditor/
 TALER_EXCHANGE_CACHE_HOME = ${XDG_CACHE_HOME:-${TALER_HOME}/.cache}/taler-exchange/
 TALER_AUDITOR_CACHE_HOME = ${XDG_CACHE_HOME:-${TALER_HOME}/.cache}/taler-auditor/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-runtime/
+TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-runtime/
 
 [libeufin-bank]
 CURRENCY = EUR
diff --git a/src/util/auditor-paths.conf b/src/util/auditor-paths.conf
@@ -26,4 +26,4 @@ TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-${TALER_HOME}/.config}/taler-auditor/
 TALER_CACHE_HOME = ${XDG_CACHE_HOME:-${TALER_HOME}/.cache}/taler-auditor/
 
 # Runtime data (always lost on system boot)
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-auditor-runtime/
+TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-auditor-runtime/