gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-exchange] branch master updated (d972a26e -> ccb88693)


From: gnunet
Subject: [taler-exchange] branch master updated (d972a26e -> ccb88693)
Date: Sat, 18 Jan 2020 13:35:54 +0100

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

grothoff pushed a change to branch master
in repository exchange.

    from d972a26e generate 11.5-compatible db
     new e0fbfb68 provide account_section for all wire out inconsistencies
     new ccb88693 doxygen

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/auditor/taler-wire-auditor.c         | 20 ++++++++++++--------
 src/lib/testing_api_helpers_exchange.c   |  2 +-
 src/lib/testing_api_trait_amount.c       | 16 ++++++----------
 src/lib/testing_api_trait_blinding_key.c |  4 +---
 src/lib/testing_api_trait_cmd.c          |  9 ++++-----
 src/lib/testing_api_trait_coin_priv.c    |  2 +-
 src/lib/testing_api_trait_contract.c     |  4 ++--
 src/lib/testing_api_trait_denom_pub.c    | 17 ++++++++---------
 src/lib/testing_api_trait_denom_sig.c    |  2 +-
 src/lib/testing_api_trait_exchange_pub.c |  2 +-
 src/lib/testing_api_trait_exchange_sig.c |  2 +-
 src/lib/testing_api_trait_json.c         |  4 ++--
 12 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index 4181534d..5cf4a5c3 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -1059,13 +1059,14 @@ wire_out_cb (void *cls,
        This is moderately harmless, it might just be that the aggreator
        has not yet fully caught up with the transfers it should do. */
     report (report_wire_out_inconsistencies,
-            json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s}",
+            json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s, s:s}",
                        "row", (json_int_t) rowid,
                        "amount_wired", TALER_JSON_from_amount (&zero),
                        "amount_justified", TALER_JSON_from_amount (amount),
                        "wtid", GNUNET_JSON_from_data_auto (wtid),
                        "timestamp", json_from_time_abs (date),
-                       "diagnostic", "wire transfer not made (yet?)"));
+                       "diagnostic", "wire transfer not made (yet?)",
+                       "account_section", wa->section_name));
     GNUNET_break (GNUNET_OK ==
                   TALER_amount_add (&total_bad_amount_out_minus,
                                     &total_bad_amount_out_minus,
@@ -1083,26 +1084,28 @@ wire_out_cb (void *cls,
          we should count the wire transfer as entirely spurious, and
          additionally consider the justified wire transfer as missing. */
       report (report_wire_out_inconsistencies,
-              json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s}",
+              json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s, s:s}",
                          "row", (json_int_t) rowid,
                          "amount_wired", TALER_JSON_from_amount (
                            &roi->details.amount),
                          "amount_justified", TALER_JSON_from_amount (&zero),
                          "wtid", GNUNET_JSON_from_data_auto (wtid),
                          "timestamp", json_from_time_abs (date),
-                         "diagnostic", "recevier account missmatch"));
+                         "diagnostic", "recevier account missmatch",
+                         "account_section", wa->section_name));
       GNUNET_break (GNUNET_OK ==
                     TALER_amount_add (&total_bad_amount_out_plus,
                                       &total_bad_amount_out_plus,
                                       &roi->details.amount));
       report (report_wire_out_inconsistencies,
-              json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s}",
+              json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s, s:s}",
                          "row", (json_int_t) rowid,
                          "amount_wired", TALER_JSON_from_amount (&zero),
                          "amount_justified", TALER_JSON_from_amount (amount),
                          "wtid", GNUNET_JSON_from_data_auto (wtid),
                          "timestamp", json_from_time_abs (date),
-                         "diagnostic", "receiver account missmatch"));
+                         "diagnostic", "receiver account missmatch",
+                         "account_section", wa->section_name));
       GNUNET_break (GNUNET_OK ==
                     TALER_amount_add (&total_bad_amount_out_minus,
                                       &total_bad_amount_out_minus,
@@ -1116,14 +1119,15 @@ wire_out_cb (void *cls,
                              amount))
   {
     report (report_wire_out_inconsistencies,
-            json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s}",
+            json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s, s:s}",
                        "row", (json_int_t) rowid,
                        "amount_justified", TALER_JSON_from_amount (amount),
                        "amount_wired", TALER_JSON_from_amount (
                          &roi->details.amount),
                        "wtid", GNUNET_JSON_from_data_auto (wtid),
                        "timestamp", json_from_time_abs (date),
-                       "diagnostic", "wire amount does not match"));
+                       "diagnostic", "wire amount does not match",
+                       "account_section", wa->section_name));
     if (0 < TALER_amount_cmp (amount,
                               &roi->details.amount))
     {
diff --git a/src/lib/testing_api_helpers_exchange.c 
b/src/lib/testing_api_helpers_exchange.c
index fdabd4a4..1aeff16d 100644
--- a/src/lib/testing_api_helpers_exchange.c
+++ b/src/lib/testing_api_helpers_exchange.c
@@ -492,7 +492,7 @@ fail:
  * launch the exchange process itself.
  *
  * @param config_filename configuration file to use
- * @param ec[out] will be set to the exchange configuration data
+ * @param[out] ec will be set to the exchange configuration data
  * @return #GNUNET_OK on success, #GNUNET_NO if test should be
  *         skipped, #GNUNET_SYSERR on test failure
  */
diff --git a/src/lib/testing_api_trait_amount.c 
b/src/lib/testing_api_trait_amount.c
index 395e6b6c..b33259e5 100644
--- a/src/lib/testing_api_trait_amount.c
+++ b/src/lib/testing_api_trait_amount.c
@@ -37,15 +37,13 @@
  * @param cmd command to extract the amount from.
  * @param index which amount to pick if @a cmd has multiple
  *        on offer
- * @param amount[out] set to the amount.
- *
+ * @param[out] amount set to the amount.
  * @return #GNUNET_OK on success
  */
 int
-TALER_TESTING_get_trait_amount_obj
-  (const struct TALER_TESTING_Command *cmd,
-  unsigned int index,
-  const struct TALER_Amount **amount)
+TALER_TESTING_get_trait_amount_obj (const struct TALER_TESTING_Command *cmd,
+                                    unsigned int index,
+                                    const struct TALER_Amount **amount)
 {
   return cmd->traits (cmd->cls,
                       (const void **) amount,
@@ -60,13 +58,11 @@ TALER_TESTING_get_trait_amount_obj
  * @param index which amount to offer, in case there are
  *        multiple available.
  * @param amount the amount to offer.
- *
  * @return the trait.
  */
 struct TALER_TESTING_Trait
-TALER_TESTING_make_trait_amount_obj
-  (unsigned int index,
-  const struct TALER_Amount *amount)
+TALER_TESTING_make_trait_amount_obj (unsigned int index,
+                                     const struct TALER_Amount *amount)
 {
   struct TALER_TESTING_Trait ret = {
     .index = index,
diff --git a/src/lib/testing_api_trait_blinding_key.c 
b/src/lib/testing_api_trait_blinding_key.c
index cf343666..f2011687 100644
--- a/src/lib/testing_api_trait_blinding_key.c
+++ b/src/lib/testing_api_trait_blinding_key.c
@@ -37,8 +37,7 @@
  *
  * @param cmd command to extract trait from
  * @param index which coin to pick if @a cmd has multiple on offer.
- * @param blinding_key[out] set to the offered blinding key.
- *
+ * @param[out] blinding_key set to the offered blinding key.
  * @return #GNUNET_OK on success.
  */
 int
@@ -59,7 +58,6 @@ TALER_TESTING_get_trait_blinding_key
  *
  * @param index index number to associate to the offered key.
  * @param blinding_key blinding key to offer.
- *
  * @return the trait.
  */
 struct TALER_TESTING_Trait
diff --git a/src/lib/testing_api_trait_cmd.c b/src/lib/testing_api_trait_cmd.c
index d008bc1d..0c7dc0c8 100644
--- a/src/lib/testing_api_trait_cmd.c
+++ b/src/lib/testing_api_trait_cmd.c
@@ -31,6 +31,7 @@
 
 #define TALER_TESTING_TRAIT_CMD "cmd"
 
+
 /**
  * Obtain a command from @a cmd.
  *
@@ -39,8 +40,7 @@
  *        kind of traits do not need this index.  For
  *        example, a "batch" CMD returns always the
  *        CMD currently being executed.
- * @param cmd_[out] where to write the wire details.
- *
+ * @param[out] cmd_ where to write the wire details.
  * @return #GNUNET_OK on success.
  */
 int
@@ -67,9 +67,8 @@ TALER_TESTING_get_trait_cmd
  * @return the trait.
  */
 struct TALER_TESTING_Trait
-TALER_TESTING_make_trait_cmd
-  (unsigned int index,
-  const struct TALER_TESTING_Command *cmd)
+TALER_TESTING_make_trait_cmd (unsigned int index,
+                              const struct TALER_TESTING_Command *cmd)
 {
   struct TALER_TESTING_Trait ret = {
     .index = index,
diff --git a/src/lib/testing_api_trait_coin_priv.c 
b/src/lib/testing_api_trait_coin_priv.c
index 1984f808..a8b496e7 100644
--- a/src/lib/testing_api_trait_coin_priv.c
+++ b/src/lib/testing_api_trait_coin_priv.c
@@ -38,7 +38,7 @@
  *
  * @param cmd command to extract trait from.
  * @param index index of the coin priv to obtain.
- * @param coin_priv[out] set to the private key of the coin.
+ * @param[out] coin_priv set to the private key of the coin.
  * @return #GNUNET_OK on success.
  */
 int
diff --git a/src/lib/testing_api_trait_contract.c 
b/src/lib/testing_api_trait_contract.c
index 7ef2c6b5..0fe74177 100644
--- a/src/lib/testing_api_trait_contract.c
+++ b/src/lib/testing_api_trait_contract.c
@@ -33,13 +33,13 @@
  */
 #define TALER_TESTING_TRAIT_CONTRACT_TERMS "contract-terms"
 
+
 /**
  * Obtain contract terms from @a cmd.
  *
  * @param cmd command to extract the contract terms from.
  * @param index contract terms index number.
- * @param contract_terms[out] where to write the contract
- *        terms.
+ * @param[out] contract_terms where to write the contract terms.
  * @return #GNUNET_OK on success.
  */
 int
diff --git a/src/lib/testing_api_trait_denom_pub.c 
b/src/lib/testing_api_trait_denom_pub.c
index 6f6e2f83..7217495c 100644
--- a/src/lib/testing_api_trait_denom_pub.c
+++ b/src/lib/testing_api_trait_denom_pub.c
@@ -37,15 +37,14 @@
  *
  * @param cmd command to extract trait from
  * @param index index number of the denom to obtain.
- * @param denom_pub[out] set to the offered denom pub.
- *
+ * @param[out] denom_pub set to the offered denom pub.
  * @return #GNUNET_OK on success.
  */
 int
-TALER_TESTING_get_trait_denom_pub
-  (const struct TALER_TESTING_Command *cmd,
-  unsigned int index,
-  const struct TALER_EXCHANGE_DenomPublicKey **denom_pub)
+TALER_TESTING_get_trait_denom_pub (const struct TALER_TESTING_Command *cmd,
+                                   unsigned int index,
+                                   const struct
+                                   TALER_EXCHANGE_DenomPublicKey **denom_pub)
 {
   return cmd->traits (cmd->cls,
                       (const void **) denom_pub,
@@ -62,9 +61,9 @@ TALER_TESTING_get_trait_denom_pub
  * @return the trait.
  */
 struct TALER_TESTING_Trait
-TALER_TESTING_make_trait_denom_pub
-  (unsigned int index,
-  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub)
+TALER_TESTING_make_trait_denom_pub (unsigned int index,
+                                    const struct
+                                    TALER_EXCHANGE_DenomPublicKey *denom_pub)
 {
   struct TALER_TESTING_Trait ret = {
     .index = index,
diff --git a/src/lib/testing_api_trait_denom_sig.c 
b/src/lib/testing_api_trait_denom_sig.c
index cfb19d43..9f6e2b98 100644
--- a/src/lib/testing_api_trait_denom_sig.c
+++ b/src/lib/testing_api_trait_denom_sig.c
@@ -38,7 +38,7 @@
  *
  * @param cmd command to extract the denom sig from.
  * @param index index number associated with the denom sig.
- * @param denom_sig[out] set to the offered signature.
+ * @param[out] denom_sig set to the offered signature.
  * @return #GNUNET_OK on success.
  */
 int
diff --git a/src/lib/testing_api_trait_exchange_pub.c 
b/src/lib/testing_api_trait_exchange_pub.c
index b98f6589..a7fc215e 100644
--- a/src/lib/testing_api_trait_exchange_pub.c
+++ b/src/lib/testing_api_trait_exchange_pub.c
@@ -36,7 +36,7 @@
  *
  * @param cmd command to extract trait from
  * @param index index number of the exchange to obtain.
- * @param exchange_pub[out] set to the offered exchange pub.
+ * @param[out] exchange_pub set to the offered exchange pub.
  * @return #GNUNET_OK on success.
  */
 int
diff --git a/src/lib/testing_api_trait_exchange_sig.c 
b/src/lib/testing_api_trait_exchange_sig.c
index 5790beb1..ffb084a5 100644
--- a/src/lib/testing_api_trait_exchange_sig.c
+++ b/src/lib/testing_api_trait_exchange_sig.c
@@ -36,7 +36,7 @@
  *
  * @param cmd command to extract trait from
  * @param index index number of the exchange to obtain.
- * @param exchange_sig[out] set to the offered exchange signature.
+ * @param[out] exchange_sig set to the offered exchange signature.
  * @return #GNUNET_OK on success.
  */
 int
diff --git a/src/lib/testing_api_trait_json.c b/src/lib/testing_api_trait_json.c
index 110661b5..f7739aa8 100644
--- a/src/lib/testing_api_trait_json.c
+++ b/src/lib/testing_api_trait_json.c
@@ -37,7 +37,7 @@
  *
  * @param cmd command to extract the keys from.
  * @param index index number associate with the keys on offer.
- * @param keys[out] where to write the serialized keys.
+ * @param[out] keys where to write the serialized keys.
  * @return #GNUNET_OK on success.
  */
 int
@@ -82,7 +82,7 @@ TALER_TESTING_make_trait_exchange_keys
  * @param index index number associate with the wire details
  *        on offer; usually zero, as one command sticks to
  *        one bank account.
- * @param wire_details[out] where to write the wire details.
+ * @param[out] wire_details where to write the wire details.
  * @return #GNUNET_OK on success.
  */
 int

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]