-fix port

src/testing/test_exchange_api-twisted.conf

@@ -8,9 +8,6 @@
 # only seeks the exchange/BASE_URL URL to connect to the exchange.
 BASE_URL = "http://localhost:8888/"
 
-[bank]
-HTTP_PORT = 8082
-
 [twister]
 # HTTP listen port for twister
 HTTP_PORT = 8888
@@ -30,4 +27,3 @@ ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/taler-service-twister.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
-

src/testing/test_exchange_api_twisted.c

@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as
@@ -112,7 +112,8 @@ run (void *cls,
    * response from a refresh-reveal operation.
    */
   struct TALER_TESTING_Command refresh_409_conflict[] = {
-    CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve",
+    CMD_TRANSFER_TO_EXCHANGE (
+      "refresh-create-reserve",
       "EUR:5.01"),
     /**
      * Make previous command effective.
@@ -121,32 +122,36 @@ run (void *cls,
     /**
      * Withdraw EUR:5.
      */
-    TALER_TESTING_cmd_withdraw_amount ("refresh-withdraw-coin",
+    TALER_TESTING_cmd_withdraw_amount (
+      "refresh-withdraw-coin",
       "refresh-create-reserve",
       "EUR:5",
       0,                                  /* age restriction off */
       MHD_HTTP_OK),
-    TALER_TESTING_cmd_deposit ("refresh-deposit-partial",
+    TALER_TESTING_cmd_deposit (
+      "refresh-deposit-partial",
       "refresh-withdraw-coin",
       0,
       bc.user42_payto,
-                               "{\"items\":[{\"name\":\"ice cream\",\
+      "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
-                     \"value\":\"EUR:1\"}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
       MHD_HTTP_OK),
     /**
      * Melt the rest of the coin's value
      * (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */
-    TALER_TESTING_cmd_melt ("refresh-melt",
+    TALER_TESTING_cmd_melt (
+      "refresh-melt",
       "refresh-withdraw-coin",
       MHD_HTTP_OK,
       NULL),
     /* Trigger 409 Conflict.  */
-    TALER_TESTING_cmd_flip_upload ("flip-upload",
+    TALER_TESTING_cmd_flip_upload (
+      "flip-upload",
       config_file,
       "transfer_privs.0"),
-    TALER_TESTING_cmd_refresh_reveal ("refresh-(flipped-)reveal",
+    TALER_TESTING_cmd_refresh_reveal (
+      "refresh-(flipped-)reveal",
       "refresh-melt",
       MHD_HTTP_CONFLICT),
     TALER_TESTING_cmd_end ()
@@ -159,20 +164,22 @@ run (void *cls,
    * lib test suite.
    */
   struct TALER_TESTING_Command refund[] = {
-    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r1",
+    CMD_TRANSFER_TO_EXCHANGE (
+      "create-reserve-r1",
       "EUR:5.01"),
     CMD_EXEC_WIREWATCH ("wirewatch-r1"),
-    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-r1",
+    TALER_TESTING_cmd_withdraw_amount (
+      "withdraw-coin-r1",
       "create-reserve-r1",
       "EUR:5",
       0,                                  /* age restriction off */
       MHD_HTTP_OK),
-    TALER_TESTING_cmd_deposit ("deposit-refund-1",
+    TALER_TESTING_cmd_deposit (
+      "deposit-refund-1",
       "withdraw-coin-r1",
       0,
       bc.user42_payto,
-                               "{\"items\":[{\"name\":\"ice cream\","
+      "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:5\"}]}",
-                               "\"value\":\"EUR:5\"}]}",
       GNUNET_TIME_UNIT_MINUTES,
       "EUR:5",
       MHD_HTTP_OK),
@@ -190,15 +197,15 @@ run (void *cls,
     /* This next deposit CMD is only used to provide a
      * good merchant signature to the next (failing) refund
      * operations.  */
-    TALER_TESTING_cmd_deposit ("deposit-refund-to-fail",
+    TALER_TESTING_cmd_deposit (
+      "deposit-refund-to-fail",
       "withdraw-coin-r1",
       0,                          /* coin index.  */
       bc.user42_payto,
       /* This parameter will make any comparison about
          h_contract_terms fail, when /refund will be handled.
          So in other words, this is h_contract mismatch.  */
-                               "{\"items\":[{\"name\":\"ice skate\","
+      "{\"items\":[{\"name\":\"ice skate\",\"value\":\"EUR:5\"}]}",
-                               "\"value\":\"EUR:5\"}]}",
       GNUNET_TIME_UNIT_MINUTES,
       "EUR:5",
       MHD_HTTP_CONFLICT),
@@ -219,7 +226,8 @@ run (void *cls,
    * are out of date.
    */
   struct TALER_TESTING_Command expired_keys[] = {
-    TALER_TESTING_cmd_modify_header_dl ("modify-expiration",
+    TALER_TESTING_cmd_modify_header_dl (
+      "modify-expiration",
       config_file,
       MHD_HTTP_HEADER_EXPIRES,
       "Wed, 19 Jan 586524 08:01:49 GMT"),
@@ -232,7 +240,8 @@ run (void *cls,
     CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r2",
                               "EUR:55.01"),
     CMD_EXEC_WIREWATCH ("wirewatch-r2"),
-    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-r2",
+    TALER_TESTING_cmd_withdraw_amount (
+      "withdraw-coin-r2",
       "create-reserve-r2",
       "EUR:5",
       0,                                  /* age restriction off */
@@ -242,17 +251,22 @@ run (void *cls,
 #endif
 
   struct TALER_TESTING_Command commands[] = {
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
+    TALER_TESTING_cmd_wire_add (
+      "add-wire-account",
       "payto://x-taler-bank/localhost/2?receiver-name=2",
       MHD_HTTP_NO_CONTENT,
       false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
+    TALER_TESTING_cmd_exec_offline_sign_keys (
+      "offline-sign-future-keys",
       config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
+    TALER_TESTING_cmd_check_keys_pull_all_keys (
+      "refetch /keys",
       1),
-    TALER_TESTING_cmd_batch ("refresh-reveal-409-conflict",
+    TALER_TESTING_cmd_batch (
+      "refresh-reveal-409-conflict",
       refresh_409_conflict),
-    TALER_TESTING_cmd_batch ("refund",
+    TALER_TESTING_cmd_batch (
+      "refund",
       refund),
 #if 0
     TALER_TESTING_cmd_batch ("expired-keys",