[GNUnet-SVN] [taler-exchange] branch master updated: minor changes to get #3464 to work, finally

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 173c848  minor changes to get #3464 to work, finally
173c848 is described below

commit 173c848fe93dce1ca59edd408a376334ef4047bf
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon May 29 18:27:15 2017 +0200

    minor changes to get #3464 to work, finally
---
 src/exchange/taler-exchange-httpd_keystate.c |  4 ++--
 src/exchange/taler-exchange-wirewatch.c      | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_keystate.c 
b/src/exchange/taler-exchange-httpd_keystate.c
index 0de85ee..57f33d5 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -882,12 +882,12 @@ TEH_KS_acquire_ (const char *location)
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "No valid signing key found!\n");
 
-    keys = json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
+    keys = json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
                       "master_public_key",
                       GNUNET_JSON_from_data_auto (&TEH_master_public_key),
                       "signkeys", key_state->sign_keys_array,
                       "denoms", key_state->denom_keys_array,
-                      "payback", key_state->payback_array,
+//                      "payback", key_state->payback_array,
                       "auditors", key_state->auditors_array,
                       "list_issue_date", GNUNET_JSON_from_time_abs 
(key_state->reload_time),
                       "eddsa_pub", GNUNET_JSON_from_data_auto 
(&key_state->current_sign_key_issue.issue.signkey_pub),
diff --git a/src/exchange/taler-exchange-wirewatch.c 
b/src/exchange/taler-exchange-wirewatch.c
index 195aa47..aee3083 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -142,6 +142,12 @@ shutdown_task (void *cls)
 static int
 exchange_serve_process_config ()
 {
+  if (NULL == type)
+  {
+    fprintf (stderr,
+             "Option `-t' to specify wire plugin is mandatory.\n");
+    return GNUNET_SYSERR;
+  }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "taler",
@@ -169,7 +175,6 @@ exchange_serve_process_config ()
              "Failed to initialize DB subsystem\n");
     return GNUNET_SYSERR;
   }
-
   if (NULL ==
       (wire_plugin = TALER_WIRE_plugin_load (cfg,
                                             type)))
@@ -219,6 +224,8 @@ history_cb (void *cls,
   {
     hh = NULL;
 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "End of list. Committing progress!\n");
     ret = db_plugin->commit (db_plugin->cls,
                             session);
     if (GNUNET_OK == ret)
@@ -236,6 +243,10 @@ history_cb (void *cls,
                                       NULL);
     return GNUNET_OK; /* will be ignored anyway */
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Adding wire transfer over %s with subject `%s'\n",
+              TALER_amount2s (&details->amount),
+              TALER_B2S (&details->reserve_pub));
   ret = db_plugin->reserves_in_insert (db_plugin->cls,
                                       session,
                                       &details->reserve_pub,

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