merchant

commit 59413577cf283700e603192d35f6b060e0135495
parent 24a2a3f887ce34d42dc20dc7952b8edeb4a21bd4
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  3 Jun 2020 20:43:01 +0200

avoid amount_zero, use DEFAULT instead

Diffstat:
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
10
++--------

1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -4612,9 +4612,6 @@ RETRY:
                               tip_id,
                               sizeof (*tip_id));
   {
-    struct TALER_Amount amount_zero;
-    TALER_amount_get_zero (pg->currency,
-                           &amount_zero);
     struct GNUNET_PQ_QueryParam params[] = {
       GNUNET_PQ_query_param_string (instance_id),
       GNUNET_PQ_query_param_auto_from_type (reserve_pubp),
@@ -4623,7 +4620,6 @@ RETRY:
       GNUNET_PQ_query_param_string (next_url),
       GNUNET_PQ_query_param_absolute_time (expiration),
       TALER_PQ_query_param_amount (amount),
-      TALER_PQ_query_param_amount (&amount_zero),
       GNUNET_PQ_query_param_end
     };
 
@@ -7132,18 +7128,16 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
                             ",expiration"
                             ",amount_val"
                             ",amount_frac"
-                            ",picked_up_val"
-                            ",picked_up_frac"
                             ") "
                             "SELECT"
-                            " reserve_serial, $3, $4, $5, $6, $7, $8, $9, $10"
+                            " reserve_serial, $3, $4, $5, $6, $7, $8"
                             " FROM merchant_tip_reserves"
                             " WHERE reserve_pub=$2"
                             "  AND merchant_serial = "
                             "     (SELECT merchant_serial"
                             "        FROM merchant_instances"
                             "       WHERE merchant_id=$1)",
-                            7),
+                            8),
     /* For postgres_lookup_pickup() */
     GNUNET_PQ_make_prepare ("lookup_pickup",
                             "SELECT"