[taler-exchange] branch master updated (6f69bc42 -> 8e7b0f5f)

[gnunet]

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

grothoff pushed a change to branch master
in repository exchange.

    from 6f69bc42 fix GNUNET_DISK_fn_write() rval check to match latest GNUnet 
API
     new a11f6aa8 do not generate invalid /wire replies
     new 8e7b0f5f rename wire2.c to wire.c

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:
 src/exchange/Makefile.am                                 |  2 +-
 ...xchange-httpd_wire2.c => taler-exchange-httpd_wire.c} | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 rename src/exchange/{taler-exchange-httpd_wire2.c => 
taler-exchange-httpd_wire.c} (93%)

diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index 03723752..554c42fd 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -103,7 +103,7 @@ taler_exchange_httpd_SOURCES = \
   taler-exchange-httpd_responses.c taler-exchange-httpd_responses.h \
   taler-exchange-httpd_terms.c taler-exchange-httpd_terms.h \
   taler-exchange-httpd_transfers_get.c taler-exchange-httpd_transfers_get.h \
-  taler-exchange-httpd_wire2.c taler-exchange-httpd_wire.h \
+  taler-exchange-httpd_wire.c taler-exchange-httpd_wire.h \
   taler-exchange-httpd_withdraw.c taler-exchange-httpd_withdraw.h
 
 #  taler-exchange-httpd_management_post_keys.c
diff --git a/src/exchange/taler-exchange-httpd_wire2.c 
b/src/exchange/taler-exchange-httpd_wire.c
similarity index 93%
rename from src/exchange/taler-exchange-httpd_wire2.c
rename to src/exchange/taler-exchange-httpd_wire.c
index b4f60b72..876cece1 100644
--- a/src/exchange/taler-exchange-httpd_wire2.c
+++ b/src/exchange/taler-exchange-httpd_wire.c
@@ -213,6 +213,13 @@ build_wire_state (void)
     json_decref (wire_accounts_array);
     return NULL;
   }
+  if (0 == json_array_size (wire_accounts_array))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No bank accounts for the exchange configured. Administrator 
must `enable-account` with taler-exchange-offline!\n");
+    json_decref (wire_accounts_array);
+    return NULL;
+  }
   wire_fee_object = json_object ();
   GNUNET_assert (NULL != wire_fee_object);
   {
@@ -243,6 +250,15 @@ build_wire_state (void)
           json_decref (wire_accounts_array);
           return NULL;
         }
+        if (0 == json_array_size (a))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "No wire fees for `%s' configured. Administrator must 
set `wire-fee` with taler-exchange-offline!\n",
+                      wire_method);
+          json_decref (wire_accounts_array);
+          json_decref (wire_fee_object);
+          return NULL;
+        }
         GNUNET_assert (0 ==
                        json_object_set_new (wire_fee_object,
                                             wire_method,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.