[taler-donau] branch master updated: minor changes

[gnunet]

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

johannes-casaburi pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new 87f088e  minor changes
87f088e is described below

commit 87f088e4d0e5e9800ab98ed5842fd0cb129d2f82
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Sun Mar 17 21:12:50 2024 +0100

    minor changes
---
 contrib/gana                          |  2 +-
 src/donau/donau-httpd_keys.c          | 13 +++++++++----
 src/donaudb/0002-donation_units.sql   |  6 +++---
 src/donaudb/pg_insert_donation_unit.c |  7 +++----
 src/donaudb/pg_insert_donation_unit.h |  4 ++--
 src/include/donaudb_plugin.h          |  4 ++--
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 2b58127..53d0992 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 2b581279ae67a1068b07a8c010ac1ab7b85e18df
+Subproject commit 53d0992890e1ebb8f8c6bd747533abe157baec66
diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c
index a75b9c7..b24ab26 100644
--- a/src/donau/donau-httpd_keys.c
+++ b/src/donau/donau-httpd_keys.c
@@ -1528,9 +1528,12 @@ helper_rsa_cb (
     &value);
   if (qs < 0)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to insert donation units");
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to insert donation 
units\n");
     // FIXME: error, probably should not proceed...
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Inserted donation unit of %s\n",
+              TALER_amount2s (&value));
   hd->section_name = GNUNET_strdup (section_name);
   GNUNET_assert (
     GNUNET_OK ==
@@ -1630,10 +1633,12 @@ helper_cs_cb (
     &value);
   if (qs < 0)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to insert donation units");
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to insert donation 
units\n");
     // FIXME: error, probably should not proceed...
   }
-
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Inserted donation unit of %s\n",
+              TALER_amount2s (&value));
   hd->section_name = GNUNET_strdup (section_name);
   GNUNET_assert (
     GNUNET_OK ==
@@ -1991,7 +1996,7 @@ DH_keys_update_states ()
                            NULL,
                            0);
   key_generation++;
-  // DH_resume_keys_requests (false);
+  DH_resume_keys_requests (false);
 }
 
 
diff --git a/src/donaudb/0002-donation_units.sql 
b/src/donaudb/0002-donation_units.sql
index d8ecc48..aa93fdf 100644
--- a/src/donaudb/0002-donation_units.sql
+++ b/src/donaudb/0002-donation_units.sql
@@ -26,6 +26,6 @@ COMMENT ON TABLE donation_units
 COMMENT ON COLUMN donation_units.value
   IS 'Value the donation unit has in Taler amount';
 
-CREATE INDEX donation_units_by_validity_year
-  ON donation_units
-  (validity_year);
+-- CREATE INDEX IF NOT EXISTS donation_units_by_validity_year
+--   ON donation_units
+--   (validity_year);
diff --git a/src/donaudb/pg_insert_donation_unit.c 
b/src/donaudb/pg_insert_donation_unit.c
index cbe56e0..3f6972e 100644
--- a/src/donaudb/pg_insert_donation_unit.c
+++ b/src/donaudb/pg_insert_donation_unit.c
@@ -31,8 +31,8 @@ DH_PG_insert_donation_unit (
   void *cls,
   const struct DONAU_DonationUnitHashP *h_donation_unit_pub,
   const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
-  uint64_t validity_year,
-  struct TALER_Amount *value)
+  const uint64_t validity_year,
+  const struct TALER_Amount *value)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam iparams[] = {
@@ -50,8 +50,7 @@ DH_PG_insert_donation_unit (
            ",donation_unit_pub"
            ",validity_year"
            ",value"
-           ") VALUES "
-           "($1, $2, $3, $4);");
+           ") VALUES ($1, $2, $3, $4);");
   return GNUNET_PQ_eval_prepared_non_select (pg->conn,
                                              "donation_unit_insert",
                                              iparams);
diff --git a/src/donaudb/pg_insert_donation_unit.h 
b/src/donaudb/pg_insert_donation_unit.h
index 24dcc5b..8a5f847 100644
--- a/src/donaudb/pg_insert_donation_unit.h
+++ b/src/donaudb/pg_insert_donation_unit.h
@@ -40,7 +40,7 @@ DH_PG_insert_donation_unit (
   void *cls,
   const struct DONAU_DonationUnitHashP *h_donation_unit_pub,
   const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
-  uint64_t validity_year,
-  struct TALER_Amount *value);
+  const uint64_t validity_year,
+  const struct TALER_Amount *value);
 
 #endif
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index 6ddd508..f38012c 100644
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@ -450,8 +450,8 @@ struct DONAUDB_Plugin
     void *cls,
     const struct DONAU_DonationUnitHashP *h_donation_unit_pub,
     const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
-    uint64_t validity_year,
-    struct TALER_Amount *value);
+    const uint64_t validity_year,
+    const struct TALER_Amount *value);
 
   /**
     * Insert history entry of a charity

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