[GNUnet-SVN] [taler-exchange] branch master updated (c51b195 -> 9384234)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository exchange.

    from c51b195  report ore precisely where commands went wrong
     new 819f2d4  report ore precisely what went wrong
     new 9384234  use correct HTTP status code for commit failures

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../exchange_benchmark_home/.config/taler/account-2.json         | 4 ++--
 src/exchange-lib/testing_api_cmd_refresh.c                       | 9 ++++++---
 src/exchange-lib/testing_api_cmd_withdraw.c                      | 3 ++-
 src/exchange/taler-exchange-httpd_responses.c                    | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json 
b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
index 7061984..584b0df 100644
--- a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
+++ b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
@@ -1,5 +1,5 @@
 {
   "url": "payto://x-taler-bank/localhost:8082/2",
-  "salt": 
"08QX35Z1DA877F14N865D7GKEQ6B4M1HPQHHHZFAWN6Y64AZ6Y34NJEM6W0H7PES2B3V3QPGGXYDWCJ7181JK55ESB5FTK99Q1PF88G",
-  "master_sig": 
"KAAGPE2A9GD1N0EFQHRAXNCV0EVENS51SJAX91403F8DTPJZS1BFHA330QEZQP235R1XAND6HT1AVK4FVAC5H2BFSAWCVF0AGTS3T38"
+  "salt": 
"PYVTA2APWFGKR25915J4VRMW8RH9TKSFP0E0FEB9D2QATY2WHFYBFH4ERTP2PQNRY652RB53QHNWV0PZ4QGX0P3FHSJWNMXVSQTNFK0",
+  "master_sig": 
"92WX8HRWCP3NFAX4Y2VXQGX4M4T9M99Y08GP67TDBXXXG88JBCY6JQS75CMQGER9CSMBX39QDX00H6584MK11YSC95W9PQ2JNQZNJ30"
 }
\ No newline at end of file
diff --git a/src/exchange-lib/testing_api_cmd_refresh.c 
b/src/exchange-lib/testing_api_cmd_refresh.c
index a7cd2e6..0f8e5fc 100644
--- a/src/exchange-lib/testing_api_cmd_refresh.c
+++ b/src/exchange-lib/testing_api_cmd_refresh.c
@@ -232,8 +232,9 @@ reveal_cb (void *cls,
   if (rrs->expected_response_code != http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
+                "Unexpected response code %u/%d to command %s in %s:%u\n",
                 http_status,
+                (int) ec,
                 rrs->is->commands[rrs->is->ip].label,
                 __FILE__,
                 __LINE__);
@@ -402,8 +403,9 @@ link_cb (void *cls,
   if (rls->expected_response_code != http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
+                "Unexpected response code %u/%d to command %s in %s:%u\n",
                 http_status,
+                (int) ec,
                 link_cmd->label,
                 __FILE__,
                 __LINE__);
@@ -633,8 +635,9 @@ melt_cb (void *cls,
   if (rms->expected_response_code != http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
+                "Unexpected response code %u/%d to command %s in %s:%u\n",
                 http_status,
+                (int) ec,
                 rms->is->commands[rms->is->ip].label,
                 __FILE__,
                 __LINE__);
diff --git a/src/exchange-lib/testing_api_cmd_withdraw.c 
b/src/exchange-lib/testing_api_cmd_withdraw.c
index c36d116..35c5a50 100644
--- a/src/exchange-lib/testing_api_cmd_withdraw.c
+++ b/src/exchange-lib/testing_api_cmd_withdraw.c
@@ -120,8 +120,9 @@ reserve_withdraw_cb (void *cls,
   if (ws->expected_response_code != http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
+                "Unexpected response code %u/%d to command %s in %s:%u\n",
                 http_status,
+                (int) ec,
                 TALER_TESTING_interpreter_get_current_label (is),
                 __FILE__,
                 __LINE__);
diff --git a/src/exchange/taler-exchange-httpd_responses.c 
b/src/exchange/taler-exchange-httpd_responses.c
index d5d7e94..21046ef 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -409,7 +409,7 @@ TEH_RESPONSE_reply_commit_error (struct MHD_Connection 
*connection,
                                 enum TALER_ErrorCode ec)
 {
   return TEH_RESPONSE_reply_json_pack (connection,
-                                       MHD_HTTP_BAD_REQUEST,
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
                                        "{s:s, s:I}",
                                        "error", "commit failure",
                                       "code", (json_int_t) ec);

-- 
To stop receiving notification emails like this one, please contact
address@hidden