[taler-donau] 03/03: merge

[gnunet]

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

lukas-matyja pushed a commit to branch master
in repository donau.

commit 55b5eb66483b7e7c7113483cabf12c6e6166199a
Merge: 07e16f6 26a90ba
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Wed Mar 27 10:45:32 2024 +0100

    merge

 src/donau/.gitignore                    | 22 +++++++-------
 src/donau/donau-httpd_get-charities.c   |  5 ++--
 src/donau/donau-httpd_get-history.c     |  4 ++-
 src/donau/donau-httpd_keys.c            | 46 +++++++++++++++--------------
 src/donaudb/pg_get_charities.c          | 51 +++++++++++++++++++--------------
 src/donaudb/pg_get_history.c            | 42 ++++++++++++++++-----------
 src/donaudb/pg_iterate_donation_units.c | 42 ++++++++++++++++-----------
 src/include/donaudb_plugin.h            | 14 ++++++---
 8 files changed, 130 insertions(+), 96 deletions(-)

diff --cc src/include/donaudb_plugin.h
index 208d18d,3324637..91cf068
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@@ -107,12 -107,12 +107,18 @@@ struct DONAUDB_IssuedReceiptsMetaDat
    /**
     * number of signatures
     */
 -  unsigned int num_sig;
 +  size_t num_sig;
  
    /**
 - * Charity signature
 - */
 -  struct DONAU_BlindedDonationUnitSignature **blinded_sig;
++<<<<<<< HEAD
 +   * Array of blinded signatures
 +   */
 +  struct DONAU_BlindedDonationUnitSignature *blinded_sig;
++  ====== =
++    *Charity signature
++    *
++    / struct DONAU_BlindedDonationUnitSignature **blinded_sig;
++  >> >> >> > refs / remotes / origin / master
  
  };
  
@@@ -541,7 -537,7 +547,7 @@@ struct DONAUDB_Plugi
    * Lookup issued receipts from the charity.
    *
    * @param cls closure
-   * @param budis_hash the hash over the budi-key-pairs
 -  * @param bkp_hash the hash over the budi-key-pairs
++  * @param h_receipts the hash over the blinded unique identifiers
    * @param meta meta data about an issued request
    * @return transaction status code
    */

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