[taler-donau] 02/02: resolve conflicts

[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 e7de40b1d87191abd1cc0bdc6e61def635af6221
Merge: 13f5958 e92003d
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Wed Nov 8 00:41:40 2023 +0100

    resolve conflicts

 src/include/Makefile.am         |    6 +-
 src/include/donau_crypto_lib.h  |    3 +-
 src/include/donau_service.h     |   33 +-
 src/include/donaudb_lib.h       |   41 +-
 src/include/donaudb_plugin.h    |    1 -
 src/include/gettext.h           |   71 -
 src/include/platform.h          |  269 --
 src/include/taler_amount_lib.h  |  466 ----
 src/include/taler_crypto_lib.h  | 5885 ---------------------------------------
 src/include/taler_error_codes.h | 4499 ------------------------------
 src/include/taler_util.h        |    4 +-
 src/util/charity_signatures.c   |    1 -
 src/util/donau_signatures.c     |    6 +-
 13 files changed, 46 insertions(+), 11239 deletions(-)

diff --cc src/util/charity_signatures.c
index f95a3d0,908477b..ee5dbbd
--- a/src/util/charity_signatures.c
+++ b/src/util/charity_signatures.c
@@@ -86,8 -98,91 +86,7 @@@ TALER_charity_blinded_unique_donation_i
      GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_CHARITY_TRACK_TRANSACTION,
                                  &tps,
                                  &charity_sig->eddsa_sig,
 -                                &charity->eddsa_pub);
 -}*/
 -
 -/*
 -enum GNUNET_GenericReturnValue
 -TALER_charity_refund_verify (
 -  const struct TALER_CoinSpendPublicKeyP *coin_pub,
 -  const struct TALER_PrivateContractHashP *h_contract_terms,
 -  uint64_t rtransaction_id,
 -  const struct TALER_Amount *amount,
 -  const struct TALER_CharityPublicKeyP *charity_pub,
 -  const struct TALER_CharitySignatureP *charity_sig)
 -{
 -  struct TALER_RefundRequestPS rr = {
 -    .purpose.purpose = htonl (TALER_SIGNATURE_CHARITY_REFUND),
 -    .purpose.size = htonl (sizeof (rr)),
 -    .h_contract_terms = *h_contract_terms,
 -    .coin_pub = *coin_pub,
 -    .rtransaction_id = GNUNET_htonll (rtransaction_id)
 -  };
 -
 -  TALER_amount_hton (&rr.refund_amount,
 -                     amount);
 -  return
 -    GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_CHARITY_REFUND,
 -                                &rr,
 -                                &charity_sig->eddsa_sig,
                                  &charity_pub->eddsa_pub);
 -}*/
 -
 -/**
 - * Used by charities to return signed responses to /pay requests.
 - * Currently only used to return 200 OK signed responses.
 - */
 -
 -// struct TALER_PaymentResponsePS
 -// {
 -/**
 -   * Set to #TALER_SIGNATURE_CHARITY_PAYMENT_OK. Note that
 -   * unsuccessful payments are usually proven by some donau's signature.
 -   */
 -// struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 -
 -/**
 -   * Hash of the proposal data associated with this confirmation
 -   */
 -// struct TALER_PrivateContractHashP h_contract_terms;
 -// };
 -
 -// void
 -// TALER_charity_pay_sign (
 -// const struct TALER_PrivateContractHashP *h_contract_terms,
 -// const struct TALER_CharityPrivateKeyP *merch_priv,
 -// struct GNUNET_CRYPTO_EddsaSignature *merch_sig)
 -// {
 -// struct TALER_PaymentResponsePS mr = {
 -// .purpose.purpose = htonl (TALER_SIGNATURE_CHARITY_PAYMENT_OK),
 -// .purpose.size = htonl (sizeof (mr)),
 -// .h_contract_terms = *h_contract_terms
 -// };
 -
 -// GNUNET_CRYPTO_eddsa_sign (&merch_priv->eddsa_priv,
 -// &mr,
 -// merch_sig);
 -// }
 -
 -
 -// enum GNUNET_GenericReturnValue
 -// TALER_charity_pay_verify (
 -//   const struct TALER_PrivateContractHashP *h_contract_terms,
 -//   const struct TALER_CharityPublicKeyP *charity_pub,
 -//   const struct TALER_CharitySignatureP *charity_sig)
 -// {
 -//   struct TALER_PaymentResponsePS pr = {
 -//     .purpose.purpose = htonl (TALER_SIGNATURE_CHARITY_PAYMENT_OK),
 -//     .purpose.size = htonl (sizeof (pr)),
 -//     .h_contract_terms = *h_contract_terms
 -//   };
 -//
 -//   return
 -//     GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_CHARITY_PAYMENT_OK,
 -//                                 &pr,
 -//                                 &charity_sig->eddsa_sig,
 -//                                 &charity_pub->eddsa_pub);
 -// }
 -
 +}
  
- 
  /* end of charity_signatures.c */

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