[taler-donau] branch master updated: small fix in insert donation units

[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 276d2a4  small fix in insert donation units
276d2a4 is described below

commit 276d2a418ba94d1b0ca290efdba89c9461339537
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Tue Mar 5 10:52:41 2024 +0100

    small fix in insert donation units
---
 src/donau/donau-httpd_keys.h          | 14 +++++++-------
 src/donaudb/0002-donation_units.sql   |  2 +-
 src/donaudb/pg_insert_donation_unit.c |  6 +++---
 src/donaudb/pg_insert_donation_unit.h |  4 ++--
 src/include/donaudb_plugin.h          |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/donau/donau-httpd_keys.h b/src/donau/donau-httpd_keys.h
index 3c15f6a..c978765 100644
--- a/src/donau/donau-httpd_keys.h
+++ b/src/donau/donau-httpd_keys.h
@@ -38,6 +38,11 @@
 struct DH_DonationUnitKey
 {
 
+  /**
+   * Hash code of the donation unit public key.
+   */
+  struct DONAU_DonationUnitHashP h_donation_unit_pub;
+
   /**
    * Decoded donation unit public key (the hash of it is in
    * @e issue, but we sometimes need the full public key as well).
@@ -45,20 +50,15 @@ struct DH_DonationUnitKey
   struct DONAU_DonationUnitPublicKey donation_unit_pub;
 
   /**
-   * Hash code of the donation unit public key.
+   * The validity year.
    */
-  struct DONAU_DonationUnitHashP h_donation_unit_pub;
+  uint64_t validity_year;
 
   /**
    * Value that the donation unit represents.
    */
   struct TALER_Amount value;
 
-  /**
-   * The validity year.
-   */
-  uint64_t validity_year;
-
 };
 
 /**
diff --git a/src/donaudb/0002-donation_units.sql 
b/src/donaudb/0002-donation_units.sql
index ada1ae9..4a40a24 100644
--- a/src/donaudb/0002-donation_units.sql
+++ b/src/donaudb/0002-donation_units.sql
@@ -1,6 +1,6 @@
 --
 -- This file is part of TALER
--- Copyright (C) 2023 Taler Systems SA
+-- Copyright (C) 2024 Taler Systems SA
 --
 -- TALER is free software; you can redistribute it and/or modify it under the
 -- terms of the GNU General Public License as published by the Free Software
diff --git a/src/donaudb/pg_insert_donation_unit.c 
b/src/donaudb/pg_insert_donation_unit.c
index 8b64646..cbe56e0 100644
--- a/src/donaudb/pg_insert_donation_unit.c
+++ b/src/donaudb/pg_insert_donation_unit.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2022 Taler Systems SA
+   Copyright (C) 2024 Taler Systems SA
 
    TALER is free software; you can redistribute it and/or modify it under the
    terms of the GNU General Public License as published by the Free Software
@@ -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,
-  struct TALER_Amount *value,
-  uint64_t validity_year)
+  uint64_t validity_year,
+  struct TALER_Amount *value)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam iparams[] = {
diff --git a/src/donaudb/pg_insert_donation_unit.h 
b/src/donaudb/pg_insert_donation_unit.h
index c687007..24dcc5b 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,
-  struct TALER_Amount *value,
-  uint64_t validity_year);
+  uint64_t validity_year,
+  struct TALER_Amount *value);
 
 #endif
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index e25ab9d..94ea43c 100644
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@ -447,10 +447,10 @@ struct DONAUDB_Plugin
   enum GNUNET_DB_QueryStatus
     (*insert_donation_unit)(
     void *cls,
-    const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
     const struct DONAU_DonationUnitHashP *h_donation_unit_pub,
-    struct TALER_Amount value,
-    uint64_t validity_year);
+    const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
+    uint64_t validity_year,
+    struct TALER_Amount *value);
 
   /**
     * Insert history entry of a charity

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