This commit is contained in:
Christian Grothoff 2020-01-18 13:35:51 +01:00
parent e0fbfb68fd
commit ccb8869344
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
11 changed files with 28 additions and 36 deletions

View File

@ -492,7 +492,7 @@ fail:
* launch the exchange process itself. * launch the exchange process itself.
* *
* @param config_filename configuration file to use * @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 * @return #GNUNET_OK on success, #GNUNET_NO if test should be
* skipped, #GNUNET_SYSERR on test failure * skipped, #GNUNET_SYSERR on test failure
*/ */

View File

@ -37,15 +37,13 @@
* @param cmd command to extract the amount from. * @param cmd command to extract the amount from.
* @param index which amount to pick if @a cmd has multiple * @param index which amount to pick if @a cmd has multiple
* on offer * on offer
* @param amount[out] set to the amount. * @param[out] amount set to the amount.
*
* @return #GNUNET_OK on success * @return #GNUNET_OK on success
*/ */
int int
TALER_TESTING_get_trait_amount_obj TALER_TESTING_get_trait_amount_obj (const struct TALER_TESTING_Command *cmd,
(const struct TALER_TESTING_Command *cmd, unsigned int index,
unsigned int index, const struct TALER_Amount **amount)
const struct TALER_Amount **amount)
{ {
return cmd->traits (cmd->cls, return cmd->traits (cmd->cls,
(const void **) amount, (const void **) amount,
@ -60,13 +58,11 @@ TALER_TESTING_get_trait_amount_obj
* @param index which amount to offer, in case there are * @param index which amount to offer, in case there are
* multiple available. * multiple available.
* @param amount the amount to offer. * @param amount the amount to offer.
*
* @return the trait. * @return the trait.
*/ */
struct TALER_TESTING_Trait struct TALER_TESTING_Trait
TALER_TESTING_make_trait_amount_obj TALER_TESTING_make_trait_amount_obj (unsigned int index,
(unsigned int index, const struct TALER_Amount *amount)
const struct TALER_Amount *amount)
{ {
struct TALER_TESTING_Trait ret = { struct TALER_TESTING_Trait ret = {
.index = index, .index = index,

View File

@ -37,8 +37,7 @@
* *
* @param cmd command to extract trait from * @param cmd command to extract trait from
* @param index which coin to pick if @a cmd has multiple on offer. * @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. * @return #GNUNET_OK on success.
*/ */
int int
@ -59,7 +58,6 @@ TALER_TESTING_get_trait_blinding_key
* *
* @param index index number to associate to the offered key. * @param index index number to associate to the offered key.
* @param blinding_key blinding key to offer. * @param blinding_key blinding key to offer.
*
* @return the trait. * @return the trait.
*/ */
struct TALER_TESTING_Trait struct TALER_TESTING_Trait

View File

@ -31,6 +31,7 @@
#define TALER_TESTING_TRAIT_CMD "cmd" #define TALER_TESTING_TRAIT_CMD "cmd"
/** /**
* Obtain a command from @a cmd. * Obtain a command from @a cmd.
* *
@ -39,8 +40,7 @@
* kind of traits do not need this index. For * kind of traits do not need this index. For
* example, a "batch" CMD returns always the * example, a "batch" CMD returns always the
* CMD currently being executed. * 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. * @return #GNUNET_OK on success.
*/ */
int int
@ -67,9 +67,8 @@ TALER_TESTING_get_trait_cmd
* @return the trait. * @return the trait.
*/ */
struct TALER_TESTING_Trait struct TALER_TESTING_Trait
TALER_TESTING_make_trait_cmd TALER_TESTING_make_trait_cmd (unsigned int index,
(unsigned int index, const struct TALER_TESTING_Command *cmd)
const struct TALER_TESTING_Command *cmd)
{ {
struct TALER_TESTING_Trait ret = { struct TALER_TESTING_Trait ret = {
.index = index, .index = index,

View File

@ -38,7 +38,7 @@
* *
* @param cmd command to extract trait from. * @param cmd command to extract trait from.
* @param index index of the coin priv to obtain. * @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. * @return #GNUNET_OK on success.
*/ */
int int

View File

@ -33,13 +33,13 @@
*/ */
#define TALER_TESTING_TRAIT_CONTRACT_TERMS "contract-terms" #define TALER_TESTING_TRAIT_CONTRACT_TERMS "contract-terms"
/** /**
* Obtain contract terms from @a cmd. * Obtain contract terms from @a cmd.
* *
* @param cmd command to extract the contract terms from. * @param cmd command to extract the contract terms from.
* @param index contract terms index number. * @param index contract terms index number.
* @param contract_terms[out] where to write the contract * @param[out] contract_terms where to write the contract terms.
* terms.
* @return #GNUNET_OK on success. * @return #GNUNET_OK on success.
*/ */
int int

View File

@ -37,15 +37,14 @@
* *
* @param cmd command to extract trait from * @param cmd command to extract trait from
* @param index index number of the denom to obtain. * @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. * @return #GNUNET_OK on success.
*/ */
int int
TALER_TESTING_get_trait_denom_pub TALER_TESTING_get_trait_denom_pub (const struct TALER_TESTING_Command *cmd,
(const struct TALER_TESTING_Command *cmd, unsigned int index,
unsigned int index, const struct
const struct TALER_EXCHANGE_DenomPublicKey **denom_pub) TALER_EXCHANGE_DenomPublicKey **denom_pub)
{ {
return cmd->traits (cmd->cls, return cmd->traits (cmd->cls,
(const void **) denom_pub, (const void **) denom_pub,
@ -62,9 +61,9 @@ TALER_TESTING_get_trait_denom_pub
* @return the trait. * @return the trait.
*/ */
struct TALER_TESTING_Trait struct TALER_TESTING_Trait
TALER_TESTING_make_trait_denom_pub TALER_TESTING_make_trait_denom_pub (unsigned int index,
(unsigned int index, const struct
const struct TALER_EXCHANGE_DenomPublicKey *denom_pub) TALER_EXCHANGE_DenomPublicKey *denom_pub)
{ {
struct TALER_TESTING_Trait ret = { struct TALER_TESTING_Trait ret = {
.index = index, .index = index,

View File

@ -38,7 +38,7 @@
* *
* @param cmd command to extract the denom sig from. * @param cmd command to extract the denom sig from.
* @param index index number associated with the denom sig. * @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. * @return #GNUNET_OK on success.
*/ */
int int

View File

@ -36,7 +36,7 @@
* *
* @param cmd command to extract trait from * @param cmd command to extract trait from
* @param index index number of the exchange to obtain. * @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. * @return #GNUNET_OK on success.
*/ */
int int

View File

@ -36,7 +36,7 @@
* *
* @param cmd command to extract trait from * @param cmd command to extract trait from
* @param index index number of the exchange to obtain. * @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. * @return #GNUNET_OK on success.
*/ */
int int

View File

@ -37,7 +37,7 @@
* *
* @param cmd command to extract the keys from. * @param cmd command to extract the keys from.
* @param index index number associate with the keys on offer. * @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. * @return #GNUNET_OK on success.
*/ */
int int
@ -82,7 +82,7 @@ TALER_TESTING_make_trait_exchange_keys
* @param index index number associate with the wire details * @param index index number associate with the wire details
* on offer; usually zero, as one command sticks to * on offer; usually zero, as one command sticks to
* one bank account. * 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. * @return #GNUNET_OK on success.
*/ */
int int