[GNUnet-SVN] [taler-merchant] branch master updated (d36c617 -> 6358d9b)

[gnunet]

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

marcello pushed a change to branch master
in repository merchant.

    from d36c617  Commenting "history" CMD.
     new c99d335  Commenting\ planchet\ traits
     new c97c412  Commenting refund traits.
     new a585027  Commenting merchant signature trait.
     new 281fde0  Comment hash traits.
     new 6358d9b  Commenting string traits.

The 5 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/lib/testing_api_trait_hash.c         | 31 ++++++++++++++++++++-----------
 src/lib/testing_api_trait_merchant_sig.c |  2 ++
 src/lib/testing_api_trait_planchet.c     | 10 +++++-----
 src/lib/testing_api_trait_refund_entry.c | 10 +++++-----
 src/lib/testing_api_trait_string.c       | 27 ++++++++++++++++-----------
 5 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/lib/testing_api_trait_hash.c b/src/lib/testing_api_trait_hash.c
index d2d99d8..b1516cf 100644
--- a/src/lib/testing_api_trait_hash.c
+++ b/src/lib/testing_api_trait_hash.c
@@ -26,16 +26,23 @@
 #include <taler/taler_exchange_service.h>
 #include <taler/taler_testing_lib.h>
 
+/**
+ * TODO: have _one_ pair of getter/setter for hash-coded
+ * traits and define the getters/setters for tip id and hashed
+ * contract terms as _macros_.
+ */
+
 #define TALER_TESTING_TRAIT_TIP_ID "tip-id"
 #define TALER_TESTING_TRAIT_H_CONTRACT_TERMS "h-contract-terms"
 
 /**
  * Obtain tip id from a @a cmd.
  *
- * @param cmd command to extract trait from
- * @param index which signature to pick if @a cmd has multiple
- *        on offer
+ * @param cmd command to extract the trait from.
+ * @param index which tip id to pick if @a
+ *        cmd has multiple on offer
  * @param tip_id[out] set to the wanted data.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -55,8 +62,8 @@ TALER_TESTING_get_trait_tip_id
  * Offer tip id.
  *
  * @param index which tip id to offer if there are
- *        multiple on offer
- * @param planchet_secrets set to the offered secrets.
+ *        multiple on offer.
+ * @param tip_id set to the offered tip id.
  * @return the trait
  */
 struct TALER_TESTING_Trait
@@ -76,10 +83,10 @@ TALER_TESTING_make_trait_tip_id
 /**
  * Obtain contract terms hash from a @a cmd.
  *
- * @param cmd command to extract trait from
- * @param index which hash code to pick if @a cmd has multiple
- *        on offer
+ * @param cmd command to extract the trait from.
+ * @param index index number of the trait to fetch.
  * @param h_contract_terms[out] set to the wanted data.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -98,9 +105,11 @@ TALER_TESTING_get_trait_h_contract_terms
 /**
  * Offer contract terms hash code.
  *
- * @param index which hash code to offer if there are
- *        multiple on offer
- * @param h_contract_terms set to the offered hash code.
+ * @param index which hashed contract terms to
+ *        offer if there are multiple on offer
+ * @param h_contract_terms set to the offered hashed
+ *        contract terms.
+ *
  * @return the trait
  */
 struct TALER_TESTING_Trait
diff --git a/src/lib/testing_api_trait_merchant_sig.c 
b/src/lib/testing_api_trait_merchant_sig.c
index 26bedde..c42260a 100644
--- a/src/lib/testing_api_trait_merchant_sig.c
+++ b/src/lib/testing_api_trait_merchant_sig.c
@@ -35,6 +35,7 @@
  * @param index which signature to pick if @a cmd has multiple
  *        on offer
  * @param merchant_sig[out] set to the wanted signature.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -55,6 +56,7 @@ TALER_TESTING_get_trait_merchant_sig
  * @param index which signature to offer if there are multiple
  *        on offer
  * @param merchant_sig set to the offered signature.
+ *
  * @return the trait
  */
 struct TALER_TESTING_Trait
diff --git a/src/lib/testing_api_trait_planchet.c 
b/src/lib/testing_api_trait_planchet.c
index 8b225c3..8a20188 100644
--- a/src/lib/testing_api_trait_planchet.c
+++ b/src/lib/testing_api_trait_planchet.c
@@ -31,10 +31,10 @@
 /**
  * Obtain planchet secrets from a @a cmd.
  *
- * @param cmd command to extract trait from
- * @param index which signature to pick if @a cmd has multiple
- *        on offer
+ * @param cmd command to extract trait from.
+ * @param index index of the trait.
  * @param planchet_secrets[out] set to the wanted secrets.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -52,9 +52,9 @@ TALER_TESTING_get_trait_planchet_secrets
 /**
  * Offer planchet secrets.
  *
- * @param index which secrets to offer if there are multiple
- *        on offer
+ * @param index of the trait.
  * @param planchet_secrets set to the offered secrets.
+ *
  * @return the trait
  */
 struct TALER_TESTING_Trait
diff --git a/src/lib/testing_api_trait_refund_entry.c 
b/src/lib/testing_api_trait_refund_entry.c
index c5728b9..2ba1a90 100644
--- a/src/lib/testing_api_trait_refund_entry.c
+++ b/src/lib/testing_api_trait_refund_entry.c
@@ -34,10 +34,10 @@
 /**
  * Obtain refund entry from a @a cmd.
  *
- * @param cmd command to extract trait from
- * @param index which signature to pick if @a cmd has multiple
- *        on offer
+ * @param cmd command to extract the trait from.
+ * @param index the trait index.
  * @param refund_entry[out] set to the wanted data.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -55,9 +55,9 @@ TALER_TESTING_get_trait_refund_entry
 /**
  * Offer refund entry.
  *
- * @param index which tip id to offer if there are
- *        multiple on offer
+ * @param index index number of the trait to offer.
  * @param refund_entry set to the offered refund entry.
+ *
  * @return the trait
  */
 struct TALER_TESTING_Trait
diff --git a/src/lib/testing_api_trait_string.c 
b/src/lib/testing_api_trait_string.c
index 74b1ca0..0534b70 100644
--- a/src/lib/testing_api_trait_string.c
+++ b/src/lib/testing_api_trait_string.c
@@ -37,10 +37,11 @@
  * the same data needed by the former in order to use the "pay
  * abort" API.
  *
- * @param cmd command to extract trait from
+ * @param cmd command to extract the trait from.
  * @param index which reference to pick if @a cmd has multiple
- *        on offer
+ *        on offer.
  * @param proposal_reference[out] set to the wanted reference.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -60,8 +61,9 @@ TALER_TESTING_get_trait_proposal_reference
  * Offer a proposal reference.
  *
  * @param index which reference to offer if there are
- *        multiple on offer
- * @param proposal_reference set to the offered reference.
+ *        multiple on offer.
+ * @param proposal_reference pointer to the reference to offer.
+ *
  * @return the trait
  */
 struct TALER_TESTING_Trait
@@ -85,12 +87,14 @@ TALER_TESTING_make_trait_proposal_reference
  * @param cmd command to extract trait from
  * @param index which reference to pick if @a cmd has multiple
  *        on offer
- * @param coin_reference[out] set to the wanted reference. NOTE:
- *        a _single_ reference can contain _multiple_ instances,
- *        using semi-colon as separator.  For example, a _single_
- *        reference can be this: "coin-ref-1", or even this:
- *        "coin-ref-1;coin-ref-2".  The "pay" command contains
- *        functions that can parse such format.
+ * @param coin_reference[out] set to the wanted reference.
+ *        NOTE: a _single_ reference can contain
+ *        _multiple_ instances, using semi-colon as separator.
+ *        For example, a _single_ reference can be this:
+ *        "coin-ref-1", or even this: "coin-ref-1;coin-ref-2".
+ *        The "pay" command contains functions that can parse
+ *        such format.
+ *
  * @return #GNUNET_OK on success
  */
 int
@@ -110,8 +114,9 @@ TALER_TESTING_get_trait_coin_reference
  * Offer a coin reference.
  *
  * @param index which reference to offer if there are
- *        multiple on offer
+ *        multiple on offer.
  * @param coin_reference set to the offered reference.
+ *
  * @return the trait
  */
 struct TALER_TESTING_Trait

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