commit f1fca2bac8917f1991b3092080f636b5b62bacc2 parent b8277ed92b9c83df7818a358f67f0c568b086020 Author: Christian Grothoff <christian@grothoff.org> Date: Mon, 7 Apr 2025 13:07:58 +0200 rename 'default' instance to 'admin' Diffstat:
21 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c @@ -518,7 +518,7 @@ TMH_lookup_instance (const char *instance_id) struct GNUNET_HashCode h_instance; if (NULL == instance_id) - instance_id = "default"; + instance_id = "admin"; GNUNET_CRYPTO_hash (instance_id, strlen (instance_id), &h_instance); @@ -547,7 +547,7 @@ TMH_add_instance (struct TMH_MerchantInstance *mi) id = mi->settings.id; if (NULL == id) - id = "default"; + id = "admin"; GNUNET_CRYPTO_hash (id, strlen (id), &mi->h_instance); @@ -619,7 +619,7 @@ spa_redirect (const struct TMH_RequestHandler *rh, MHD_HTTP_HEADER_CONTENT_TYPE, "text/plain")); if ( (NULL == hc->instance) || - (0 == strcmp ("default", + (0 == strcmp ("admin", hc->instance->settings.id)) ) dst = GNUNET_strdup ("/webui/"); else @@ -1345,7 +1345,7 @@ url_handler (void *cls, }; static struct TMH_RequestHandler public_handlers[] = { { - /* for "default" instance, it does not even + /* for "admin" instance, it does not even have to exist before we give the WebUI */ .url_prefix = "/", .method = MHD_HTTP_METHOD_GET, @@ -1598,7 +1598,7 @@ url_handler (void *cls, instance_id = GNUNET_strndup (istart, slash - istart); if (0 == strcmp (instance_id, - "default")) + "admin")) { MHD_RESULT ret; struct MHD_Response *response; @@ -1634,10 +1634,10 @@ url_handler (void *cls, } hc->instance = TMH_lookup_instance (instance_id); if ( (NULL == hc->instance) && - (0 == strcmp ("default", + (0 == strcmp ("admin", instance_id)) ) hc->instance = TMH_lookup_instance (NULL); - if ( (0 == strcmp ("default", + if ( (0 == strcmp ("admin", instance_id)) && (NULL != TMH_default_auth) && (NULL != hc->instance) ) diff --git a/src/backend/taler-merchant-httpd_helper.c b/src/backend/taler-merchant-httpd_helper.c @@ -803,7 +803,7 @@ TMH_base_url_by_connection (struct MHD_Connection *connection, uri_path); } if (0 != strcmp (instance, - "default")) + "admin")) { GNUNET_buffer_write_path (buf, "/instances/"); @@ -870,7 +870,7 @@ TMH_taler_uri_by_connection (struct MHD_Connection *connection, if (NULL != uri_path) GNUNET_buffer_write_path (buf, uri_path); - if (0 != strcmp ("default", + if (0 != strcmp ("admin", instance)) { GNUNET_buffer_write_path (buf, diff --git a/src/backend/taler-merchant-httpd_private-post-instances-ID-auth.c b/src/backend/taler-merchant-httpd_private-post-instances-ID-auth.c @@ -182,7 +182,7 @@ retry: } mi->auth_override = false; if (0 == strcmp (mi->settings.id, - "default")) + "admin")) { /* The default auth string should've been cleared with the first request diff --git a/src/backend/taler-merchant-httpd_private-post-instances.c b/src/backend/taler-merchant-httpd_private-post-instances.c @@ -365,7 +365,7 @@ retry: TMH_reload_instances (mi->settings.id); } if (0 == strcmp (is.id, - "default")) + "admin")) { GNUNET_free (TMH_default_auth); /* clear it if the default instance was created */ diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c @@ -180,9 +180,9 @@ run (void *cls, "set-auth-valid", apikey), TALER_TESTING_cmd_merchant_post_instances ( - "instance-create-default", + "instance-create-admin", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", @@ -261,9 +261,9 @@ run (void *cls, "set-auth-valid", apikey), TALER_TESTING_cmd_merchant_post_instances ( - "instance-create-default", + "instance-create-admin", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", diff --git a/src/merchant-tools/taler-merchant-passwd.c b/src/merchant-tools/taler-merchant-passwd.c @@ -76,7 +76,7 @@ run (void *cls, return; } if (NULL == instance) - instance = GNUNET_strdup ("default"); + instance = GNUNET_strdup ("admin"); cfg = GNUNET_CONFIGURATION_dup (config); if (NULL == (plugin = TALER_MERCHANTDB_plugin_load (cfg))) diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c @@ -225,7 +225,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_kyc_get ( "kyc-auth-done-check", merchant_url, - NULL, /* default instance */ + NULL, /* admin instance */ "instance-create-default-account", /* h_wire_ref: which account to query */ EXCHANGE_URL, TALER_EXCHANGE_KLPT_KYC_AUTH_TRANSFER, @@ -279,7 +279,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_kyc_get ( "kyc-pending", merchant_url, - NULL, /* default instance */ + NULL, /* admin instance */ "instance-create-default-account", /* h_wire_ref: which account to query */ EXCHANGE_URL, TALER_EXCHANGE_KLPT_KYC_AUTH_TRANSFER, @@ -531,7 +531,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_instances ( "instance-create-default-setup", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", diff --git a/src/testing/test_merchant_accounts.sh b/src/testing/test_merchant_accounts.sh @@ -37,11 +37,11 @@ setup -c test_template.conf -m CONF="test_template.conf.edited" LAST_RESPONSE=$(mktemp -p "${TMPDIR:-/tmp}" test_response.conf-XXXXXX) -echo -n "Configuring 'default' instance ..." >&2 +echo -n "Configuring 'admin' instance ..." >&2 STATUS=$(curl -H "Content-Type: application/json" -X POST \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"token","token":"secret-token:new_value"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ + -d '{"auth":{"method":"token","token":"secret-token:new_value"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c @@ -207,9 +207,9 @@ run (void *cls, { struct TALER_TESTING_Command get_private_order_id[] = { TALER_TESTING_cmd_merchant_post_instances ( - "instance-create-default", + "instance-create-admin", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", @@ -256,9 +256,9 @@ run (void *cls, "4", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_purge_instance ( - "purge-default", + "purge-admin", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_end () }; @@ -1850,7 +1850,7 @@ run (void *cls, TALER_TESTING_cmd_merchant_post_instances ( "instance-create-default-setup", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", @@ -1979,12 +1979,12 @@ run (void *cls, TALER_TESTING_cmd_merchant_purge_instance ( "instance-purge-default-middle", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_instances ( "instance-create-default-after-purge", merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account-after-purge", diff --git a/src/testing/test_merchant_api_twisted.c b/src/testing/test_merchant_api_twisted.c @@ -331,9 +331,9 @@ run (void *cls, NULL, true, true), - TALER_TESTING_cmd_merchant_post_instances ("instance-create-default", + TALER_TESTING_cmd_merchant_post_instances ("instance-create-admin", twister_merchant_url, - "default", + "admin", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_post_account ( "instance-create-default-account", diff --git a/src/testing/test_merchant_instance_auth.sh b/src/testing/test_merchant_instance_auth.sh @@ -37,11 +37,11 @@ setup -c test_template.conf -m CONF="test_template.conf.edited" LAST_RESPONSE=$(mktemp -p "${TMPDIR:-/tmp}" test_response.conf-XXXXXX) -echo -n "Configuring 'default' instance ..." >&2 +echo -n "Configuring 'admin' instance ..." >&2 STATUS=$(curl -H "Content-Type: application/json" -X POST \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"token","token":"secret-token:new_value"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ + -d '{"auth":{"method":"token","token":"secret-token:new_value"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] @@ -156,7 +156,7 @@ fi echo "OK" >&2 -echo -n "Updating 'second' instance token using the 'default' auth token..." >&2 +echo -n "Updating 'second' instance token using the 'new_one' auth token..." >&2 STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer '"$NEW_SECRET" \ diff --git a/src/testing/test_merchant_instance_creation.sh b/src/testing/test_merchant_instance_creation.sh @@ -23,7 +23,7 @@ setup -c test_template.conf -m -echo -n "Configuring a merchant instance before configuring the default instance ..." +echo -n "Configuring a merchant instance before configuring the admin instance ..." STATUS=$(curl -H "Content-Type: application/json" -X POST \ http://localhost:9966/management/instances \ @@ -38,12 +38,12 @@ fi echo " OK" -echo -n "Configuring default instance ..." +echo -n "Configuring admin instance ..." STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "401" ] diff --git a/src/testing/test_merchant_instance_purge.sh b/src/testing/test_merchant_instance_purge.sh @@ -22,12 +22,12 @@ # Launch only the merchant. setup -c test_template.conf -m -echo -n "Configuring default instance ..." >&2 +echo -n "Configuring admin instance ..." >&2 STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_instance_response.sh b/src/testing/test_merchant_instance_response.sh @@ -29,7 +29,7 @@ STATUS=$(curl -H "Content-Type: application/json" -X OPTIONS \ if [ "$STATUS" != "204" ] then - exit_fail "Expected 204 when default instance does not exist yet. got: $STATUS" + exit_fail "Expected 204 when admin instance does not exist yet. got: $STATUS" fi STATUS=$(curl -H "Content-Type: application/json" -X GET \ @@ -39,13 +39,13 @@ STATUS=$(curl -H "Content-Type: application/json" -X GET \ if [ "$STATUS" != "404" ] then - exit_fail "Expected 404 when the default instance is not yet created. got: $STATUS" + exit_fail "Expected 404 when the admin instance is not yet created. got: $STATUS" fi STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"token","token":"secret-token:other_secret"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ + -d '{"auth":{"method":"token","token":"secret-token:other_secret"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] @@ -59,7 +59,7 @@ STATUS=$(curl -H "Content-Type: application/json" -X GET \ if [ "$STATUS" != "401" ] then - exit_fail "Expected 401 without the token for the list of product when the default instance was created. got: $STATUS" + exit_fail "Expected 401 without the token for the list of product when the admin instance was created. got: $STATUS" fi STATUS=$(curl -H "Content-Type: application/json" -X GET \ @@ -69,7 +69,7 @@ STATUS=$(curl -H "Content-Type: application/json" -X GET \ if [ "$STATUS" != "200" ] then - exit_fail "Expected 200 for the list of product when the default instance was created. got: $STATUS" + exit_fail "Expected 200 for the list of product when the admin instance was created. got: $STATUS" fi STATUS=$(curl -H "Content-Type: application/json" -X POST \ @@ -121,7 +121,7 @@ STATUS=$(curl -H "Content-Type: application/json" -X GET \ if [ "$STATUS" != "404" ] then - exit_fail "Expected 404 when trying to list the product and the default instance was deleted. got: $STATUS" + exit_fail "Expected 404 when trying to list the product and the admin instance was deleted. got: $STATUS" fi echo "Test PASSED" diff --git a/src/testing/test_merchant_kyc.sh b/src/testing/test_merchant_kyc.sh @@ -29,12 +29,12 @@ setup \ -u "exchange-account-2" LAST_RESPONSE=$(mktemp -p "${TMPDIR:-/tmp}" test_response.conf-XXXXXX) -echo -n "Configuring a merchant default instance ..." +echo -n "Configuring a merchant admin instance ..." STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_order_autocleanup.sh b/src/testing/test_merchant_order_autocleanup.sh @@ -97,7 +97,7 @@ fi STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ "http://localhost:9966/management/instances" \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh @@ -97,7 +97,7 @@ echo -n "Configuring merchant instance ..." STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000000},"default_pay_delay":{"d_us": 60000000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000000},"default_pay_delay":{"d_us": 60000000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_order_refund.sh b/src/testing/test_merchant_order_refund.sh @@ -97,7 +97,7 @@ echo -n "Configuring merchant instance ..." STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000000},"default_pay_delay":{"d_us": 60000000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000000},"default_pay_delay":{"d_us": 60000000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_product_creation.sh b/src/testing/test_merchant_product_creation.sh @@ -66,7 +66,7 @@ echo -n "Configuring merchant instance ..." STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ "http://localhost:9966/management/instances" \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh @@ -99,7 +99,7 @@ echo " OK" # CREATE INSTANCE FOR TESTING # -echo -n "Configuring merchant default instance ..." +echo -n "Configuring merchant admin instance ..." if [ 1 = "$USE_FAKEBANK" ] then TOR_PAYTO="payto://x-taler-bank/localhost/tor?receiver-name=tor" @@ -117,7 +117,7 @@ fi STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] @@ -273,7 +273,7 @@ set +e echo -n "Notifying merchant of correct wire transfer, but on wrong instance..." #issue 6912 -#here we are notifying the transfer into a wrong instance (default) and the payto_uri of the default instance +#here we are notifying the transfer into a wrong instance (admin) and the payto_uri of the admin instance STATUS=$(curl 'http://localhost:9966/private/transfers' \ -d "{\"credit_amount\":\"$CREDIT_AMOUNT\",\"wtid\":\"$WTID\",\"payto_uri\":\"$TOR_PAYTO\",\"exchange_url\":\"$WURL\"}" \ -m 3 \ @@ -287,7 +287,7 @@ fi echo " OK" -echo -n "Fetching wire transfers of DEFAULT instance ..." +echo -n "Fetching wire transfers of ADMIN instance ..." STATUS=$(curl 'http://localhost:9966/private/transfers' \ -w "%{http_code}" -s -o "$LAST_RESPONSE") diff --git a/src/testing/test_merchant_wirewatch.sh b/src/testing/test_merchant_wirewatch.sh @@ -82,7 +82,7 @@ else export NEXUS_ACCOUNT_NAME="GnunetCredit" # The 'gnunet' account is created by # taler-bank-manage-testing and used for - # the 'default' instance, so this must be used here. + # the 'admin' instance, so this must be used here. export SANDBOX_ACCOUNT_NAME="gnunet" export LIBEUFIN_NEXUS_URL="http://localhost:8082" @@ -206,7 +206,7 @@ echo " OK" # CREATE INSTANCE FOR TESTING # -echo -n "Configuring merchant default instance ..." +echo -n "Configuring merchant admin instance ..." if [ 1 = "$USE_FAKEBANK" ] then GNUNET_PAYTO="payto://x-taler-bank/localhost/gnunet?receiver-name=gnunet" @@ -216,7 +216,7 @@ fi STATUS=$(curl -H "Content-Type: application/json" -X POST \ -H 'Authorization: Bearer secret-token:super_secret' \ http://localhost:9966/management/instances \ - -d '{"auth":{"method":"external"},"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ + -d '{"auth":{"method":"external"},"id":"admin","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \ -w "%{http_code}" -s -o /dev/null) if [ "$STATUS" != "204" ] @@ -331,7 +331,7 @@ taler-merchant-wirewatch \ -L INFO &> merchant-wirewatch.log echo " OK" -echo -n "Fetching wire transfers of DEFAULT instance ..." +echo -n "Fetching wire transfers of ADMIN instance ..." STATUS=$(curl 'http://localhost:9966/private/transfers' \ -w "%{http_code}" \ -s \