diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/taler_exchange_service.h | 7 | ||||
| -rw-r--r-- | src/include/taler_testing_lib.h | 67 |
2 files changed, 37 insertions, 37 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 8e36bc516..4848ddfdd 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -2825,7 +2825,7 @@ typedef void * * @param curl_ctx The curl context * @param exchange_url The base url of the exchange - * @parm keys The denomination keys from the exchange + * @param keys The denomination keys from the exchange * @param reserve_priv The pivate key to the reserve * @param num_coins The number of elements in @e coin_inputs * @param coin_inputs The input for the coins to withdraw @@ -2842,8 +2842,8 @@ TALER_EXCHANGE_age_withdraw ( struct TALER_EXCHANGE_Keys *keys, const struct TALER_ReservePrivateKeyP *reserve_priv, size_t num_coins, - const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[ - const static num_coins], + const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[const static + num_coins], uint8_t max_age, TALER_EXCHANGE_AgeWithdrawCallback res_cb, void *res_cb_cls); @@ -3144,7 +3144,6 @@ struct TALER_EXCHANGE_RefreshesRevealHandle; * * @param ctx curl context * @param url exchange base URL - * @param keys exchange keys * @param rms the fresh secret that defines the refresh operation * @param rd the refresh data that characterizes the refresh operation * @param num_coins number of fresh coins to be created, length of the @a exchange_vals array, must match value in @a rd diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index d8793f4a3..374ab7afe 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -59,7 +59,7 @@ * @param status unexpected HTTP status code received * @param expected expected HTTP status code */ -#define TALER_TESTING_unexpected_status(is,status, expected) \ +#define TALER_TESTING_unexpected_status(is,status,expected) \ do { \ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, \ "Unexpected response code %u (expected: %u) to command %s in %s:%u\n", \ @@ -81,7 +81,7 @@ * @param expected expected HTTP status code * @param body received JSON-reply */ -#define TALER_TESTING_unexpected_status_with_body(is,status, expected, body) \ +#define TALER_TESTING_unexpected_status_with_body(is,status,expected,body) \ do { \ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, \ "Unexpected response code %u (expected: %u) to " \ @@ -111,7 +111,7 @@ __FILE__, \ __LINE__, \ TALER_TESTING_interpreter_get_current_label (is)); \ - }while (0) + } while (0) /** @@ -2210,6 +2210,7 @@ TALER_TESTING_cmd_proof_kyc_oauth2 ( * KYC processes which also provides a @a birthdate in a response * * @param label command label + * @param birthdate fixed birthdate, such as "2022-03-04", "2022-03-00", "2022-00-00" * @param port the TCP port to listen on */ struct TALER_TESTING_Command @@ -2463,6 +2464,30 @@ TALER_TESTING_cmd_check_aml_decisions ( unsigned int expected_http_status); +/* ****************** convenience functions ************** */ + +/** + * Get exchange URL from interpreter. Convenience function. + * + * @param is interpreter state. + * @return the exchange URL, or NULL on error + */ +const char * +TALER_TESTING_get_exchange_url ( + struct TALER_TESTING_Interpreter *is); + + +/** + * Get exchange keys from interpreter. Convenience function. + * + * @param is interpreter state. + * @return the exchange keys, or NULL on error + */ +struct TALER_EXCHANGE_Keys * +TALER_TESTING_get_keys ( + struct TALER_TESTING_Interpreter *is); + + /* *** Generic trait logic for implementing traits ********* */ @@ -2621,13 +2646,13 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits, op (bank_row, const uint64_t) \ op (officer_pub, const struct TALER_AmlOfficerPublicKeyP) \ op (officer_priv, const struct TALER_AmlOfficerPrivateKeyP) \ - op (officer_name, const char) \ + op (officer_name, const char) \ op (aml_decision, enum TALER_AmlDecisionState) \ - op (aml_justification, const char) \ - op (auditor_priv, const struct TALER_AuditorPrivateKeyP) \ - op (auditor_pub, const struct TALER_AuditorPublicKeyP) \ - op (master_priv, const struct TALER_MasterPrivateKeyP) \ - op (master_pub, const struct TALER_MasterPublicKeyP) \ + op (aml_justification, const char) \ + op (auditor_priv, const struct TALER_AuditorPrivateKeyP) \ + op (auditor_pub, const struct TALER_AuditorPublicKeyP) \ + op (master_priv, const struct TALER_MasterPrivateKeyP) \ + op (master_pub, const struct TALER_MasterPublicKeyP) \ op (purse_priv, const struct TALER_PurseContractPrivateKeyP) \ op (purse_pub, const struct TALER_PurseContractPublicKeyP) \ op (merge_priv, const struct TALER_PurseMergePrivateKeyP) \ @@ -2702,28 +2727,4 @@ TALER_TESTING_SIMPLE_TRAITS (TALER_TESTING_MAKE_DECL_SIMPLE_TRAIT) TALER_TESTING_INDEXED_TRAITS (TALER_TESTING_MAKE_DECL_INDEXED_TRAIT) -/* ****************** convenience functions ************** */ - -/** - * Get exchange URL from interpreter. Convenience function. - * - * @param is interpreter state. - * @return the exchange URL, or NULL on error - */ -const char * -TALER_TESTING_get_exchange_url ( - struct TALER_TESTING_Interpreter *is); - - -/** - * Get exchange keys from interpreter. Convenience function. - * - * @param is interpreter state. - * @return the exchange keys, or NULL on error - */ -struct TALER_EXCHANGE_Keys * -TALER_TESTING_get_keys ( - struct TALER_TESTING_Interpreter *is); - - #endif |