diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/taler_exchange_service.h | 13 | ||||
-rw-r--r-- | src/include/taler_json_lib.h | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 8020eae44..91395540f 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -1469,22 +1469,20 @@ TALER_EXCHANGE_withdraw2_cancel (struct TALER_EXCHANGE_Withdraw2Handle *wh); * validity of the keys * @param fresh_pks_len length of the @a pks array * @param fresh_pks array of @a pks_len denominations of fresh coins to create - * @param[out] res_size set to the size of the return value, or 0 on error * @return NULL * if the inputs are invalid (i.e. denomination key not with this exchange). - * Otherwise, pointer to a buffer of @a res_size to store persistently + * Otherwise, JSON data structure to store persistently * before proceeding to #TALER_EXCHANGE_melt(). * Non-null results should be freed using GNUNET_free(). */ -char * +json_t * TALER_EXCHANGE_refresh_prepare ( const struct TALER_CoinSpendPrivateKeyP *melt_priv, const struct TALER_Amount *melt_amount, const struct TALER_DenominationSignature *melt_sig, const struct TALER_EXCHANGE_DenomPublicKey *melt_pk, unsigned int fresh_pks_len, - const struct TALER_EXCHANGE_DenomPublicKey *fresh_pks, - size_t *res_size); + const struct TALER_EXCHANGE_DenomPublicKey *fresh_pks); /* ********************* /coins/$COIN_PUB/melt ***************************** */ @@ -1526,8 +1524,6 @@ typedef void * prior to calling this function. * * @param exchange the exchange handle; the exchange must be ready to operate - * @param refresh_data_length size of the @a refresh_data (returned - * in the `res_size` argument from #TALER_EXCHANGE_refresh_prepare()) * @param refresh_data the refresh data as returned from #TALER_EXCHANGE_refresh_prepare()) * @param melt_cb the callback to call with the result @@ -1537,8 +1533,7 @@ typedef void */ struct TALER_EXCHANGE_MeltHandle * TALER_EXCHANGE_melt (struct TALER_EXCHANGE_Handle *exchange, - size_t refresh_data_length, - const char *refresh_data, + const json_t *refresh_data, TALER_EXCHANGE_MeltCallback melt_cb, void *melt_cb_cls); diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index 8a2422f5a..a4b17297f 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -139,7 +139,7 @@ TALER_JSON_pack_time_rel_nbo (const char *name, * @return json pack specification */ struct GNUNET_JSON_PackSpec -TALER_JSON_pack_denomination_public_key ( +TALER_JSON_pack_denom_pub ( const char *name, const struct TALER_DenominationPublicKey *pk); @@ -153,7 +153,7 @@ TALER_JSON_pack_denomination_public_key ( * @return json pack specification */ struct GNUNET_JSON_PackSpec -TALER_JSON_pack_denomination_signature ( +TALER_JSON_pack_denom_sig ( const char *name, const struct TALER_DenominationSignature *sig); |