[GNUnet-SVN] [taler-exchange] branch master updated (34887e5 -> e140b41)

[gnunet]

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

grothoff pushed a change to branch master
in repository exchange.

    from 34887e5  importing a 'PS' struct from merchant
     new 1910d66  tolerate total-amount==fee in aggregator
     new e140b41  log amount involved

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/taler-exchange-aggregator.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/exchange/taler-exchange-aggregator.c 
b/src/exchange/taler-exchange-aggregator.c
index 7bd437b..fdb32a2 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -597,14 +597,15 @@ deposit_cb (void *cls,
   enum GNUNET_DB_QueryStatus qs;
   
   au->merchant_pub = *merchant_pub;
-  if (GNUNET_OK !=
+  if (GNUNET_SYSERR ==
       TALER_amount_subtract (&au->total_amount,
                              amount_with_fee,
                              deposit_fee))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Fatally malformed record at row %llu\n",
-                (unsigned long long) row_id);
+                "Fatally malformed record at row %llu over %s\n",
+                (unsigned long long) row_id,
+               TALER_amount2s (amount_with_fee));
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
   au->row_id = row_id;
@@ -694,14 +695,15 @@ aggregate_cb (void *cls,
                         merchant_pub,
                         sizeof (struct TALER_MerchantPublicKeyP)));
   /* compute contribution of this coin after fees */
-  if (GNUNET_OK !=
+  if (GNUNET_SYSERR ==
       TALER_amount_subtract (&delta,
                              amount_with_fee,
                              deposit_fee))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Fatally malformed record at %llu\n",
-                (unsigned long long) row_id);
+                "Fatally malformed record at %llu over amount %s\n",
+                (unsigned long long) row_id,
+               TALER_amount2s (amount_with_fee));
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
   /* add to total */

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