diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/taler_auditordb_plugin.h | 366 | ||||
| -rw-r--r-- | src/include/taler_bank_service.h | 62 | ||||
| -rw-r--r-- | src/include/taler_crypto_lib.h | 66 | ||||
| -rw-r--r-- | src/include/taler_exchange_service.h | 357 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_lib.h | 125 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_plugin.h | 590 | ||||
| -rw-r--r-- | src/include/taler_fakebank_lib.h | 34 | ||||
| -rw-r--r-- | src/include/taler_json_lib.h | 12 |
8 files changed, 725 insertions, 887 deletions
diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h index 843cc4ca7..9a7f6ed7a 100644 --- a/src/include/taler_auditordb_plugin.h +++ b/src/include/taler_auditordb_plugin.h @@ -38,10 +38,10 @@ * @param exchange_url base URL of the exchange's API */ typedef void -(*TALER_AUDITORDB_ExchangeCallback)(void *cls, - const struct - TALER_MasterPublicKeyP *master_pub, - const char *exchange_url); +(*TALER_AUDITORDB_ExchangeCallback)( + void *cls, + const struct TALER_MasterPublicKeyP *master_pub, + const char *exchange_url); /** @@ -56,10 +56,9 @@ typedef void * #GNUNET_SYSERR or other values on error. */ typedef int -(*TALER_AUDITORDB_DenominationInfoDataCallback)(void *cls, - const struct - TALER_DenominationKeyValidityPS - *issue); +(*TALER_AUDITORDB_DenominationInfoDataCallback)( + void *cls, + const struct TALER_DenominationKeyValidityPS *issue); /** @@ -78,19 +77,12 @@ typedef int * #GNUNET_SYSERR or other values on error. */ typedef int -(*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)(void *cls, - const struct - GNUNET_HashCode * - denom_pub_hash, - struct - GNUNET_TIME_Absolute - revenue_timestamp, - const struct - TALER_Amount * - revenue_balance, - const struct - TALER_Amount * - loss_balance); +(*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)( + void *cls, + const struct GNUNET_HashCode *denom_pub_hash, + struct GNUNET_TIME_Absolute revenue_timestamp, + const struct TALER_Amount *revenue_balance, + const struct TALER_Amount *loss_balance); /** @@ -107,16 +99,11 @@ typedef int * #GNUNET_SYSERR or other values on error. */ typedef int -(*TALER_AUDITORDB_HistoricReserveRevenueDataCallback)(void *cls, - struct - GNUNET_TIME_Absolute - start_time, - struct - GNUNET_TIME_Absolute - end_time, - const struct - TALER_Amount * - reserve_profits); +(*TALER_AUDITORDB_HistoricReserveRevenueDataCallback)( + void *cls, + struct GNUNET_TIME_Absolute start_time, + struct GNUNET_TIME_Absolute end_time, + const struct TALER_Amount *reserve_profits); /** @@ -379,11 +366,10 @@ struct TALER_AUDITORDB_DepositConfirmation * @param dc the deposit confirmation itself */ typedef void -(*TALER_AUDITORDB_DepositConfirmationCallback)(void *cls, - uint64_t serial_id, - const struct - TALER_AUDITORDB_DepositConfirmation - *dc); +(*TALER_AUDITORDB_DepositConfirmationCallback)( + void *cls, + uint64_t serial_id, + const struct TALER_AUDITORDB_DepositConfirmation *dc); /** @@ -553,10 +539,10 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_exchange_signkey)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_AUDITORDB_ExchangeSigningKey *sk); + (*insert_exchange_signkey)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_AUDITORDB_ExchangeSigningKey *sk); /** @@ -568,10 +554,10 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*insert_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_AUDITORDB_DepositConfirmation *dc); + (*insert_deposit_confirmation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_AUDITORDB_DepositConfirmation *dc); /** @@ -587,13 +573,13 @@ struct TALER_AUDITORDB_Plugin * @return query result status */ enum GNUNET_DB_QueryStatus - (*get_deposit_confirmations)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_public_key, - uint64_t start_id, - TALER_AUDITORDB_DepositConfirmationCallback cb, - void *cb_cls); + (*get_deposit_confirmations)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_public_key, + uint64_t start_id, + TALER_AUDITORDB_DepositConfirmationCallback cb, + void *cb_cls); /** @@ -607,10 +593,10 @@ struct TALER_AUDITORDB_Plugin * @return status of database operation */ enum GNUNET_DB_QueryStatus - (*insert_denomination_info)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_DenominationKeyValidityPS *issue); + (*insert_denomination_info)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_DenominationKeyValidityPS *issue); /** @@ -642,12 +628,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_auditor_progress_coin)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_ProgressPointCoin *ppc); + (*insert_auditor_progress_coin)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointCoin *ppc); /** @@ -661,12 +646,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_auditor_progress_coin)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_ProgressPointCoin *ppc); + (*update_auditor_progress_coin)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointCoin *ppc); /** @@ -695,12 +679,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_auditor_progress_reserve)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_ProgressPointReserve *ppr); + (*insert_auditor_progress_reserve)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointReserve *ppr); /** @@ -714,12 +697,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_auditor_progress_reserve)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_ProgressPointReserve *ppr); + (*update_auditor_progress_reserve)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointReserve *ppr); /** @@ -732,12 +714,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_auditor_progress_reserve)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - struct TALER_AUDITORDB_ProgressPointReserve * - ppr); + (*get_auditor_progress_reserve)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + struct TALER_AUDITORDB_ProgressPointReserve *ppr); /** * Insert information about the auditor's progress with an exchange's @@ -750,15 +731,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_auditor_progress_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session - *session, - const struct - TALER_MasterPublicKeyP * - master_pub, - const struct - TALER_AUDITORDB_ProgressPointDepositConfirmation - *ppdc); + (*insert_auditor_progress_deposit_confirmation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc); /** @@ -772,15 +749,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_auditor_progress_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session - *session, - const struct - TALER_MasterPublicKeyP * - master_pub, - const struct - TALER_AUDITORDB_ProgressPointDepositConfirmation - *ppdc); + (*update_auditor_progress_deposit_confirmation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc); /** @@ -793,15 +766,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_auditor_progress_deposit_confirmation)(void *cls, - struct TALER_AUDITORDB_Session * - session, - const struct - TALER_MasterPublicKeyP * - master_pub, - struct - TALER_AUDITORDB_ProgressPointDepositConfirmation - *ppdc); + (*get_auditor_progress_deposit_confirmation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc); /** @@ -815,13 +784,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_auditor_progress_aggregation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_ProgressPointAggregation - *ppa); + (*insert_auditor_progress_aggregation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointAggregation *ppa); /** @@ -835,13 +802,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_auditor_progress_aggregation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_ProgressPointAggregation - *ppa); + (*update_auditor_progress_aggregation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_ProgressPointAggregation *ppa); /** @@ -854,13 +819,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_auditor_progress_aggregation)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - struct - TALER_AUDITORDB_ProgressPointAggregation * - ppa); + (*get_auditor_progress_aggregation)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + struct TALER_AUDITORDB_ProgressPointAggregation *ppa); /** @@ -877,17 +840,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_wire_auditor_account_progress)(void *cls, - struct TALER_AUDITORDB_Session * - session, - const struct - TALER_MasterPublicKeyP *master_pub, - const char *account_name, - const struct - TALER_AUDITORDB_WireAccountProgressPoint - *pp, - uint64_t in_wire_off, - uint64_t out_wire_off); + (*insert_wire_auditor_account_progress)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const char *account_name, + const struct TALER_AUDITORDB_WireAccountProgressPoint *pp, + uint64_t in_wire_off, + uint64_t out_wire_off); /** @@ -904,17 +864,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_wire_auditor_account_progress)(void *cls, - struct TALER_AUDITORDB_Session * - session, - const struct - TALER_MasterPublicKeyP *master_pub, - const char *account_name, - const struct - TALER_AUDITORDB_WireAccountProgressPoint - *pp, - uint64_t in_wire_off, - uint64_t out_wire_off); + (*update_wire_auditor_account_progress)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const char *account_name, + const struct TALER_AUDITORDB_WireAccountProgressPoint *pp, + uint64_t in_wire_off, + uint64_t out_wire_off); /** @@ -930,16 +887,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_wire_auditor_account_progress)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const char *account_name, - struct - TALER_AUDITORDB_WireAccountProgressPoint - *pp, - uint64_t *in_wire_off, - uint64_t *out_wire_off); + (*get_wire_auditor_account_progress)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const char *account_name, + struct TALER_AUDITORDB_WireAccountProgressPoint *pp, + uint64_t *in_wire_off, + uint64_t *out_wire_off); /** @@ -954,12 +909,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_wire_auditor_progress)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_WireProgressPoint *pp); + (*insert_wire_auditor_progress)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_WireProgressPoint *pp); /** @@ -974,12 +928,11 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_wire_auditor_progress)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_AUDITORDB_WireProgressPoint *pp); + (*update_wire_auditor_progress)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_AUDITORDB_WireProgressPoint *pp); /** @@ -1394,16 +1347,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_historic_denom_revenue)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct GNUNET_HashCode *denom_pub_hash, - struct GNUNET_TIME_Absolute - revenue_timestamp, - const struct TALER_Amount *revenue_balance, - const struct - TALER_Amount *recoup_loss_balance); + (*insert_historic_denom_revenue)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + const struct GNUNET_HashCode *denom_pub_hash, + struct GNUNET_TIME_Absolute revenue_timestamp, + const struct TALER_Amount *revenue_balance, + const struct TALER_Amount *recoup_loss_balance); /** @@ -1418,13 +1369,12 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_historic_denom_revenue)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - TALER_AUDITORDB_HistoricDenominationRevenueDataCallback - cb, - void *cb_cls); + (*select_historic_denom_revenue)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb, + void *cb_cls); /** @@ -1439,14 +1389,13 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_historic_reserve_revenue)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - struct GNUNET_TIME_Absolute start_time, - struct GNUNET_TIME_Absolute end_time, - const struct - TALER_Amount *reserve_profits); + (*insert_historic_reserve_revenue)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + struct GNUNET_TIME_Absolute start_time, + struct GNUNET_TIME_Absolute end_time, + const struct TALER_Amount *reserve_profits); /** @@ -1460,13 +1409,12 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_historic_reserve_revenue)(void *cls, - struct TALER_AUDITORDB_Session *session, - const struct - TALER_MasterPublicKeyP *master_pub, - TALER_AUDITORDB_HistoricReserveRevenueDataCallback - cb, - void *cb_cls); + (*select_historic_reserve_revenue)( + void *cls, + struct TALER_AUDITORDB_Session *session, + const struct TALER_MasterPublicKeyP *master_pub, + TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb, + void *cb_cls); /** diff --git a/src/include/taler_bank_service.h b/src/include/taler_bank_service.h index e65a4847e..44487a61a 100644 --- a/src/include/taler_bank_service.h +++ b/src/include/taler_bank_service.h @@ -138,14 +138,14 @@ typedef void * In this case, the callback is not called. */ struct TALER_BANK_AdminAddIncomingHandle * -TALER_BANK_admin_add_incoming (struct GNUNET_CURL_Context *ctx, - const struct TALER_BANK_AuthenticationData *auth, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_Amount *amount, - const char *debit_account, - TALER_BANK_AdminAddIncomingCallback res_cb, - void *res_cb_cls); +TALER_BANK_admin_add_incoming ( + struct GNUNET_CURL_Context *ctx, + const struct TALER_BANK_AuthenticationData *auth, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_Amount *amount, + const char *debit_account, + TALER_BANK_AdminAddIncomingCallback res_cb, + void *res_cb_cls); /** @@ -155,8 +155,8 @@ TALER_BANK_admin_add_incoming (struct GNUNET_CURL_Context *ctx, * @param aai the admin add incoming request handle */ void -TALER_BANK_admin_add_incoming_cancel (struct - TALER_BANK_AdminAddIncomingHandle *aai); +TALER_BANK_admin_add_incoming_cancel ( + struct TALER_BANK_AdminAddIncomingHandle *aai); /* ********************* /transfer *********************** */ @@ -174,13 +174,13 @@ TALER_BANK_admin_add_incoming_cancel (struct * @param[out] buf_size set to number of bytes in @a buf, 0 on error */ void -TALER_BANK_prepare_transfer (const char *destination_account_payto_uri, - const struct TALER_Amount *amount, - const char *exchange_base_url, - const struct - TALER_WireTransferIdentifierRawP *wtid, - void **buf, - size_t *buf_size); +TALER_BANK_prepare_transfer ( + const char *destination_account_payto_uri, + const struct TALER_Amount *amount, + const char *exchange_base_url, + const struct TALER_WireTransferIdentifierRawP *wtid, + void **buf, + size_t *buf_size); /** @@ -305,13 +305,13 @@ struct TALER_BANK_CreditDetails * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration */ typedef int -(*TALER_BANK_CreditHistoryCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - uint64_t serial_id, - const struct - TALER_BANK_CreditDetails *details, - const json_t *json); +(*TALER_BANK_CreditHistoryCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + uint64_t serial_id, + const struct TALER_BANK_CreditDetails *details, + const json_t *json); /** @@ -415,13 +415,13 @@ struct TALER_BANK_DebitDetails * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration */ typedef int -(*TALER_BANK_DebitHistoryCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - uint64_t serial_id, - const struct - TALER_BANK_DebitDetails *details, - const json_t *json); +(*TALER_BANK_DebitHistoryCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + uint64_t serial_id, + const struct TALER_BANK_DebitDetails *details, + const json_t *json); /** diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 206a3db3d..dbf038311 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -633,11 +633,10 @@ TALER_planchet_to_coin (const struct TALER_DenominationPublicKey *dk, * @param[out] ts computed transfer secret */ void -TALER_link_derive_transfer_secret (const struct - TALER_CoinSpendPrivateKeyP *coin_priv, - const struct - TALER_TransferPrivateKeyP *trans_priv, - struct TALER_TransferSecretP *ts); +TALER_link_derive_transfer_secret ( + const struct TALER_CoinSpendPrivateKeyP *coin_priv, + const struct TALER_TransferPrivateKeyP *trans_priv, + struct TALER_TransferSecretP *ts); /** @@ -649,11 +648,10 @@ TALER_link_derive_transfer_secret (const struct * @param[out] transfer_secret set to the shared secret */ void -TALER_link_reveal_transfer_secret (const struct - TALER_TransferPrivateKeyP *trans_priv, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - struct TALER_TransferSecretP *transfer_secret); +TALER_link_reveal_transfer_secret ( + const struct TALER_TransferPrivateKeyP *trans_priv, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + struct TALER_TransferSecretP *transfer_secret); /** @@ -665,12 +663,10 @@ TALER_link_reveal_transfer_secret (const struct * @param[out] transfer_secret set to the shared secret */ void -TALER_link_recover_transfer_secret (const struct - TALER_TransferPublicKeyP *trans_pub, - const struct - TALER_CoinSpendPrivateKeyP *coin_priv, - struct TALER_TransferSecretP * - transfer_secret); +TALER_link_recover_transfer_secret ( + const struct TALER_TransferPublicKeyP *trans_pub, + const struct TALER_CoinSpendPrivateKeyP *coin_priv, + struct TALER_TransferSecretP *transfer_secret); /** @@ -758,11 +754,10 @@ TALER_exchange_wire_signature_hash (const char *payto_uri, * @return #GNUNET_OK if signature is valid */ int -TALER_exchange_wire_signature_check (const char *payto_uri, - const struct - TALER_MasterPublicKeyP *master_pub, - const struct - TALER_MasterSignatureP *master_sig); +TALER_exchange_wire_signature_check ( + const char *payto_uri, + const struct TALER_MasterPublicKeyP *master_pub, + const struct TALER_MasterSignatureP *master_sig); /** @@ -773,10 +768,10 @@ TALER_exchange_wire_signature_check (const char *payto_uri, * @param[out] master_sig where to write the signature */ void -TALER_exchange_wire_signature_make (const char *payto_uri, - const struct - TALER_MasterPrivateKeyP *master_priv, - struct TALER_MasterSignatureP *master_sig); +TALER_exchange_wire_signature_make ( + const char *payto_uri, + const struct TALER_MasterPrivateKeyP *master_priv, + struct TALER_MasterSignatureP *master_sig); /** @@ -804,12 +799,11 @@ TALER_merchant_wire_signature_hash (const char *payto_uri, * @return #GNUNET_OK if signature is valid */ int -TALER_merchant_wire_signature_check (const char *payto_uri, - const char *salt, - const struct - TALER_MerchantPublicKeyP *merch_pub, - const struct - TALER_MerchantSignatureP *merch_sig); +TALER_merchant_wire_signature_check ( + const char *payto_uri, + const char *salt, + const struct TALER_MerchantPublicKeyP *merch_pub, + const struct TALER_MerchantSignatureP *merch_sig); /** @@ -821,11 +815,11 @@ TALER_merchant_wire_signature_check (const char *payto_uri, * @param[out] merch_sig where to write the signature */ void -TALER_merchant_wire_signature_make (const char *payto_uri, - const char *salt, - const struct - TALER_MerchantPrivateKeyP *merch_priv, - struct TALER_MerchantSignatureP *merch_sig); +TALER_merchant_wire_signature_make ( + const char *payto_uri, + const char *salt, + const struct TALER_MerchantPrivateKeyP *merch_priv, + struct TALER_MerchantSignatureP *merch_sig); #endif diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 175f08f17..311175e41 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -355,11 +355,10 @@ enum TALER_EXCHANGE_VersionCompatibility * @param compat protocol compatibility information */ typedef void -(*TALER_EXCHANGE_CertificationCallback) (void *cls, - const struct TALER_EXCHANGE_Keys *keys, - enum - TALER_EXCHANGE_VersionCompatibility - compat); +(*TALER_EXCHANGE_CertificationCallback) ( + void *cls, + const struct TALER_EXCHANGE_Keys *keys, + enum TALER_EXCHANGE_VersionCompatibility compat); /** @@ -547,9 +546,9 @@ TALER_EXCHANGE_destroy_denomination_key (struct * @return details about the given denomination key */ const struct TALER_EXCHANGE_DenomPublicKey * -TALER_EXCHANGE_get_denomination_key_by_hash (const struct - TALER_EXCHANGE_Keys *keys, - const struct GNUNET_HashCode *hc); +TALER_EXCHANGE_get_denomination_key_by_hash ( + const struct TALER_EXCHANGE_Keys *keys, + const struct GNUNET_HashCode *hc); /** @@ -561,11 +560,9 @@ TALER_EXCHANGE_get_denomination_key_by_hash (const struct * @return NULL on error (@a exchange_pub not known) */ const struct TALER_EXCHANGE_SigningPublicKey * -TALER_EXCHANGE_get_signing_key_info (const struct - TALER_EXCHANGE_Keys *keys, - const struct - TALER_ExchangePublicKeyP * - exchange_pub); +TALER_EXCHANGE_get_signing_key_info ( + const struct TALER_EXCHANGE_Keys *keys, + const struct TALER_ExchangePublicKeyP *exchange_pub); /* ********************* /wire *********************** */ @@ -648,12 +645,12 @@ struct TALER_EXCHANGE_WireAccount * @param accounts list of wire accounts of the exchange, NULL on error */ typedef void -(*TALER_EXCHANGE_WireCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - unsigned int accounts_len, - const struct - TALER_EXCHANGE_WireAccount *accounts); +(*TALER_EXCHANGE_WireCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + unsigned int accounts_len, + const struct TALER_EXCHANGE_WireAccount *accounts); /** @@ -719,14 +716,13 @@ struct TALER_EXCHANGE_DepositHandle; * be forwarded to the customer) */ typedef void -(*TALER_EXCHANGE_DepositResultCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct - TALER_ExchangeSignatureP *exchange_sig, - const struct - TALER_ExchangePublicKeyP *sign_key, - const json_t *obj); +(*TALER_EXCHANGE_DepositResultCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_ExchangeSignatureP *exchange_sig, + const struct TALER_ExchangePublicKeyP *sign_key, + const json_t *obj); /** @@ -820,12 +816,12 @@ struct TALER_EXCHANGE_RefundHandle; * be forwarded to the customer) */ typedef void -(*TALER_EXCHANGE_RefundCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct - TALER_ExchangePublicKeyP *sign_key, - const json_t *obj); +(*TALER_EXCHANGE_RefundCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_ExchangePublicKeyP *sign_key, + const json_t *obj); /** @@ -1103,16 +1099,15 @@ struct TALER_EXCHANGE_ReserveHistory * @param history detailed transaction history, NULL on error */ typedef void -(*TALER_EXCHANGE_ReservesGetCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const json_t *json, - const struct - TALER_Amount *balance, - unsigned int history_length, - const struct - TALER_EXCHANGE_ReserveHistory * - history); +(*TALER_EXCHANGE_ReservesGetCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const json_t *json, + const struct + TALER_Amount *balance, + unsigned int history_length, + const struct TALER_EXCHANGE_ReserveHistory *history); /** @@ -1132,11 +1127,11 @@ typedef void * signatures fail to verify). In this case, the callback is not called. */ struct TALER_EXCHANGE_ReservesGetHandle * -TALER_EXCHANGE_reserves_get (struct TALER_EXCHANGE_Handle *exchange, - const struct - TALER_ReservePublicKeyP *reserve_pub, - TALER_EXCHANGE_ReservesGetCallback cb, - void *cb_cls); +TALER_EXCHANGE_reserves_get ( + struct TALER_EXCHANGE_Handle *exchange, + const struct TALER_ReservePublicKeyP *reserve_pub, + TALER_EXCHANGE_ReservesGetCallback cb, + void *cb_cls); /** @@ -1146,8 +1141,8 @@ TALER_EXCHANGE_reserves_get (struct TALER_EXCHANGE_Handle *exchange, * @param rgh the reserve request handle */ void -TALER_EXCHANGE_reserves_get_cancel (struct - TALER_EXCHANGE_ReservesGetHandle *rgh); +TALER_EXCHANGE_reserves_get_cancel ( + struct TALER_EXCHANGE_ReservesGetHandle *rgh); /* ********************* POST /reserves/$RESERVE_PUB/withdraw *********************** */ @@ -1171,12 +1166,12 @@ struct TALER_EXCHANGE_WithdrawHandle; * @param full_response full response from the exchange (for logging, in case of errors) */ typedef void -(*TALER_EXCHANGE_WithdrawCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct - TALER_DenominationSignature *sig, - const json_t *full_response); +(*TALER_EXCHANGE_WithdrawCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_DenominationSignature *sig, + const json_t *full_response); /** @@ -1201,14 +1196,13 @@ typedef void * In this case, the callback is not called. */ struct TALER_EXCHANGE_WithdrawHandle * -TALER_EXCHANGE_withdraw (struct TALER_EXCHANGE_Handle *exchange, - const struct TALER_EXCHANGE_DenomPublicKey *pk, - const struct - TALER_ReservePrivateKeyP *reserve_priv, - const struct TALER_PlanchetSecretsP *ps, - TALER_EXCHANGE_WithdrawCallback - res_cb, - void *res_cb_cls); +TALER_EXCHANGE_withdraw ( + struct TALER_EXCHANGE_Handle *exchange, + const struct TALER_EXCHANGE_DenomPublicKey *pk, + const struct TALER_ReservePrivateKeyP *reserve_priv, + const struct TALER_PlanchetSecretsP *ps, + TALER_EXCHANGE_WithdrawCallback res_cb, + void *res_cb_cls); /** @@ -1234,17 +1228,14 @@ TALER_EXCHANGE_withdraw (struct TALER_EXCHANGE_Handle *exchange, * In this case, the callback is not called. */ struct TALER_EXCHANGE_WithdrawHandle * -TALER_EXCHANGE_withdraw2 (struct TALER_EXCHANGE_Handle *exchange, - const struct - TALER_EXCHANGE_DenomPublicKey *pk, - const struct - TALER_ReserveSignatureP *reserve_sig, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_PlanchetSecretsP *ps, - TALER_EXCHANGE_WithdrawCallback - res_cb, - void *res_cb_cls); +TALER_EXCHANGE_withdraw2 ( + struct TALER_EXCHANGE_Handle *exchange, + const struct TALER_EXCHANGE_DenomPublicKey *pk, + const struct TALER_ReserveSignatureP *reserve_sig, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_PlanchetSecretsP *ps, + TALER_EXCHANGE_WithdrawCallback res_cb, + void *res_cb_cls); /** @@ -1299,17 +1290,14 @@ TALER_EXCHANGE_withdraw_cancel (struct TALER_EXCHANGE_WithdrawHandle *wh); * Non-null results should be freed using GNUNET_free(). */ char * -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); +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); /* ********************* /coins/$COIN_PUB/melt ***************************** */ @@ -1403,15 +1391,14 @@ TALER_EXCHANGE_melt_cancel (struct TALER_EXCHANGE_MeltHandle *mh); * @param full_response full response from the exchange (for logging, in case of errors) */ typedef void -(*TALER_EXCHANGE_RefreshesRevealCallback)(void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - unsigned int num_coins, - const struct - TALER_PlanchetSecretsP *coin_privs, - const struct - TALER_DenominationSignature *sigs, - const json_t *full_response); +(*TALER_EXCHANGE_RefreshesRevealCallback)( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + unsigned int num_coins, + const struct TALER_PlanchetSecretsP *coin_privs, + const struct TALER_DenominationSignature *sigs, + const json_t *full_response); /** @@ -1443,13 +1430,13 @@ struct TALER_EXCHANGE_RefreshesRevealHandle; * In this case, neither callback will be called. */ struct TALER_EXCHANGE_RefreshesRevealHandle * -TALER_EXCHANGE_refreshes_reveal (struct TALER_EXCHANGE_Handle *exchange, - size_t refresh_data_length, - const char *refresh_data, - uint32_t noreveal_index, - TALER_EXCHANGE_RefreshesRevealCallback - reveal_cb, - void *reveal_cb_cls); +TALER_EXCHANGE_refreshes_reveal ( + struct TALER_EXCHANGE_Handle *exchange, + size_t refresh_data_length, + const char *refresh_data, + uint32_t noreveal_index, + TALER_EXCHANGE_RefreshesRevealCallback reveal_cb, + void *reveal_cb_cls); /** @@ -1459,9 +1446,8 @@ TALER_EXCHANGE_refreshes_reveal (struct TALER_EXCHANGE_Handle *exchange, * @param rrh the refresh reval handle */ void -TALER_EXCHANGE_refreshes_reveal_cancel (struct - TALER_EXCHANGE_RefreshesRevealHandle * - rrh); +TALER_EXCHANGE_refreshes_reveal_cancel ( + struct TALER_EXCHANGE_RefreshesRevealHandle *rrh); /* ********************* /coins/$COIN_PUB/link ***************************** */ @@ -1490,17 +1476,15 @@ struct TALER_EXCHANGE_LinkHandle; * @param full_response full response from the exchange (for logging, in case of errors) */ typedef void -(*TALER_EXCHANGE_LinkCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - unsigned int num_coins, - const struct - TALER_CoinSpendPrivateKeyP *coin_privs, - const struct - TALER_DenominationSignature *sigs, - const struct - TALER_DenominationPublicKey *pubs, - const json_t *full_response); +(*TALER_EXCHANGE_LinkCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + unsigned int num_coins, + const struct TALER_CoinSpendPrivateKeyP *coin_privs, + const struct TALER_DenominationSignature *sigs, + const struct TALER_DenominationPublicKey *pubs, + const json_t *full_response); /** @@ -1560,20 +1544,18 @@ struct TALER_EXCHANGE_TransfersGetHandle; * @param details array with details about the combined transactions */ typedef void -(*TALER_EXCHANGE_TransfersGetCallback)(void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct - TALER_ExchangePublicKeyP *sign_key, - const json_t *json, - const struct GNUNET_HashCode *h_wire, - struct GNUNET_TIME_Absolute - execution_time, - const struct TALER_Amount *total_amount, - const struct TALER_Amount *wire_fee, - unsigned int details_length, - const struct - TALER_TrackTransferDetails *details); +(*TALER_EXCHANGE_TransfersGetCallback)( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_ExchangePublicKeyP *sign_key, + const json_t *json, + const struct GNUNET_HashCode *h_wire, + struct GNUNET_TIME_Absolute execution_time, + const struct TALER_Amount *total_amount, + const struct TALER_Amount *wire_fee, + unsigned int details_length, + const struct TALER_TrackTransferDetails *details); /** @@ -1587,11 +1569,11 @@ typedef void * @return handle to cancel operation */ struct TALER_EXCHANGE_TransfersGetHandle * -TALER_EXCHANGE_transfers_get (struct TALER_EXCHANGE_Handle *exchange, - const struct - TALER_WireTransferIdentifierRawP *wtid, - TALER_EXCHANGE_TransfersGetCallback cb, - void *cb_cls); +TALER_EXCHANGE_transfers_get ( + struct TALER_EXCHANGE_Handle *exchange, + const struct TALER_WireTransferIdentifierRawP *wtid, + TALER_EXCHANGE_TransfersGetCallback cb, + void *cb_cls); /** @@ -1601,8 +1583,8 @@ TALER_EXCHANGE_transfers_get (struct TALER_EXCHANGE_Handle *exchange, * @param wdh the wire deposits request handle */ void -TALER_EXCHANGE_transfers_get_cancel (struct - TALER_EXCHANGE_TransfersGetHandle *wdh); +TALER_EXCHANGE_transfers_get_cancel ( + struct TALER_EXCHANGE_TransfersGetHandle *wdh); /* ********************* GET /deposits/ *********************** */ @@ -1629,19 +1611,16 @@ struct TALER_EXCHANGE_DepositGetHandle; * @param coin_contribution contribution to the total amount by this coin (can be NULL) */ typedef void -(*TALER_EXCHANGE_DepositGetCallback)(void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct - TALER_ExchangePublicKeyP *sign_key, - const json_t *json, - const struct - TALER_WireTransferIdentifierRawP * - wtid, - struct GNUNET_TIME_Absolute - execution_time, - const struct - TALER_Amount *coin_contribution); +(*TALER_EXCHANGE_DepositGetCallback)( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_ExchangePublicKeyP *sign_key, + const json_t *json, + const struct TALER_WireTransferIdentifierRawP *wtid, + struct GNUNET_TIME_Absolute + execution_time, + const struct TALER_Amount *coin_contribution); /** @@ -1659,16 +1638,14 @@ typedef void * @return handle to abort request */ struct TALER_EXCHANGE_DepositGetHandle * -TALER_EXCHANGE_deposits_get (struct TALER_EXCHANGE_Handle *exchange, - const struct - TALER_MerchantPrivateKeyP *merchant_priv, - const struct GNUNET_HashCode *h_wire, - const struct - GNUNET_HashCode *h_contract_terms, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - TALER_EXCHANGE_DepositGetCallback cb, - void *cb_cls); +TALER_EXCHANGE_deposits_get ( + struct TALER_EXCHANGE_Handle *exchange, + const struct TALER_MerchantPrivateKeyP *merchant_priv, + const struct GNUNET_HashCode *h_wire, + const struct GNUNET_HashCode *h_contract_terms, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + TALER_EXCHANGE_DepositGetCallback cb, + void *cb_cls); /** @@ -1678,9 +1655,8 @@ TALER_EXCHANGE_deposits_get (struct TALER_EXCHANGE_Handle *exchange, * @param dwh the wire deposits request handle */ void -TALER_EXCHANGE_deposits_get_cancel (struct - TALER_EXCHANGE_DepositGetHandle * - dwh); +TALER_EXCHANGE_deposits_get_cancel ( + struct TALER_EXCHANGE_DepositGetHandle *dwh); /** @@ -1695,13 +1671,12 @@ TALER_EXCHANGE_deposits_get_cancel (struct * @return #GNUNET_OK if @a history is valid, #GNUNET_SYSERR if not */ int -TALER_EXCHANGE_verify_coin_history (const struct - TALER_EXCHANGE_DenomPublicKey *dk, - const char *currency, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - json_t *history, - struct TALER_Amount *total); +TALER_EXCHANGE_verify_coin_history ( + const struct TALER_EXCHANGE_DenomPublicKey *dk, + const char *currency, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + json_t *history, + struct TALER_Amount *total); /** @@ -1721,15 +1696,14 @@ TALER_EXCHANGE_verify_coin_history (const struct * #GNUNET_SYSERR if there was a protocol violation in @a history */ int -TALER_EXCHANGE_parse_reserve_history (struct TALER_EXCHANGE_Handle *exchange, - const json_t *history, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const char *currency, - struct TALER_Amount *balance, - unsigned int history_length, - struct TALER_EXCHANGE_ReserveHistory * - rhistory); +TALER_EXCHANGE_parse_reserve_history ( + struct TALER_EXCHANGE_Handle *exchange, + const json_t *history, + const struct TALER_ReservePublicKeyP *reserve_pub, + const char *currency, + struct TALER_Amount *balance, + unsigned int history_length, + struct TALER_EXCHANGE_ReserveHistory *rhistory); /** @@ -1739,9 +1713,9 @@ TALER_EXCHANGE_parse_reserve_history (struct TALER_EXCHANGE_Handle *exchange, * @param len number of entries in @a rhistory */ void -TALER_EXCHANGE_free_reserve_history (struct - TALER_EXCHANGE_ReserveHistory *rhistory, - unsigned int len); +TALER_EXCHANGE_free_reserve_history ( + struct TALER_EXCHANGE_ReserveHistory *rhistory, + unsigned int len); /* ********************* /recoup *********************** */ @@ -1773,16 +1747,15 @@ struct TALER_EXCHANGE_RecoupHandle; * @param full_response full response from the exchange (for logging, in case of errors) */ typedef void -(*TALER_EXCHANGE_RecoupResultCallback) (void *cls, - unsigned int http_status, - enum TALER_ErrorCode ec, - const struct TALER_Amount *amount, - struct GNUNET_TIME_Absolute timestamp, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct - TALER_CoinSpendPublicKeyP *old_coin_pub, - const json_t *full_response); +(*TALER_EXCHANGE_RecoupResultCallback) ( + void *cls, + unsigned int http_status, + enum TALER_ErrorCode ec, + const struct TALER_Amount *amount, + struct GNUNET_TIME_Absolute timestamp, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_CoinSpendPublicKeyP *old_coin_pub, + const json_t *full_response); /** diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h index b43b991d5..7139335cc 100644 --- a/src/include/taler_exchangedb_lib.h +++ b/src/include/taler_exchangedb_lib.h @@ -50,11 +50,10 @@ * #GNUNET_SYSERR to abort iteration with error! */ typedef int -(*TALER_EXCHANGEDB_SigningKeyIterator)(void *cls, - const char *filename, - const struct - TALER_EXCHANGEDB_PrivateSigningKeyInformationP - *ski); +(*TALER_EXCHANGEDB_SigningKeyIterator)( + void *cls, + const char *filename, + const struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *ski); /** @@ -84,11 +83,10 @@ TALER_EXCHANGEDB_signing_keys_iterate (const char *exchange_base_dir, * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. */ int -TALER_EXCHANGEDB_signing_key_write (const char *exchange_base_dir, - struct GNUNET_TIME_Absolute start, - const struct - TALER_EXCHANGEDB_PrivateSigningKeyInformationP - *ski); +TALER_EXCHANGEDB_signing_key_write ( + const char *exchange_base_dir, + struct GNUNET_TIME_Absolute start, + const struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *ski); /** @@ -102,11 +100,10 @@ TALER_EXCHANGEDB_signing_key_write (const char *exchange_base_dir, * #GNUNET_SYSERR to abort iteration with error! */ typedef int -(*TALER_EXCHANGEDB_DenominationKeyIterator)(void *cls, - const char *alias, - const struct - TALER_EXCHANGEDB_DenominationKey - *dki); +(*TALER_EXCHANGEDB_DenominationKeyIterator)( + void *cls, + const char *alias, + const struct TALER_EXCHANGEDB_DenominationKey *dki); /** @@ -120,11 +117,10 @@ typedef int * #GNUNET_SYSERR to abort iteration with error! */ typedef int -(*TALER_EXCHANGEDB_RevocationIterator)(void *cls, - const struct GNUNET_HashCode *denom_hash, - const struct - TALER_MasterSignatureP * - revocation_master_sig); +(*TALER_EXCHANGEDB_RevocationIterator)( + void *cls, + const struct GNUNET_HashCode *denom_hash, + const struct TALER_MasterSignatureP *revocation_master_sig); /** @@ -141,10 +137,10 @@ typedef int * as maybe none of the files were well-formed) */ int -TALER_EXCHANGEDB_denomination_keys_iterate (const char *exchange_base_dir, - TALER_EXCHANGEDB_DenominationKeyIterator - it, - void *it_cls); +TALER_EXCHANGEDB_denomination_keys_iterate ( + const char *exchange_base_dir, + TALER_EXCHANGEDB_DenominationKeyIterator it, + void *it_cls); /** @@ -160,11 +156,11 @@ TALER_EXCHANGEDB_denomination_keys_iterate (const char *exchange_base_dir, * as maybe none of the files were well-formed) */ int -TALER_EXCHANGEDB_revocations_iterate (const char *revocation_dir, - const struct - TALER_MasterPublicKeyP *master_pub, - TALER_EXCHANGEDB_RevocationIterator it, - void *it_cls); +TALER_EXCHANGEDB_revocations_iterate ( + const char *revocation_dir, + const struct TALER_MasterPublicKeyP *master_pub, + TALER_EXCHANGEDB_RevocationIterator it, + void *it_cls); /** @@ -177,11 +173,10 @@ TALER_EXCHANGEDB_revocations_iterate (const char *revocation_dir, * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. */ int -TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, - const struct - GNUNET_HashCode *denom_hash, - const struct - TALER_MasterPrivateKeyP *mpriv); +TALER_EXCHANGEDB_denomination_key_revoke ( + const char *revocation_dir, + const struct GNUNET_HashCode *denom_hash, + const struct TALER_MasterPrivateKeyP *mpriv); /** @@ -192,10 +187,9 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. */ int -TALER_EXCHANGEDB_denomination_key_write (const char *filename, - const struct - TALER_EXCHANGEDB_DenominationKey - *dki); +TALER_EXCHANGEDB_denomination_key_write ( + const char *filename, + const struct TALER_EXCHANGEDB_DenominationKey *dki); /** @@ -206,10 +200,9 @@ TALER_EXCHANGEDB_denomination_key_write (const char *filename, * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ int -TALER_EXCHANGEDB_denomination_key_read (const char *filename, - struct - TALER_EXCHANGEDB_DenominationKey - *dki); +TALER_EXCHANGEDB_denomination_key_read ( + const char *filename, + struct TALER_EXCHANGEDB_DenominationKey *dki); /** @@ -227,14 +220,14 @@ TALER_EXCHANGEDB_denomination_key_read (const char *filename, * #GNUNET_SYSERR to abort iteration with error! */ typedef int -(*TALER_EXCHANGEDB_AuditorIterator)(void *cls, - const struct TALER_AuditorPublicKeyP *apub, - const char *auditor_url, - const struct TALER_MasterPublicKeyP *mpub, - unsigned int dki_len, - const struct TALER_AuditorSignatureP *asigs, - const struct - TALER_DenominationKeyValidityPS *dki); +(*TALER_EXCHANGEDB_AuditorIterator)( + void *cls, + const struct TALER_AuditorPublicKeyP *apub, + const char *auditor_url, + const struct TALER_MasterPublicKeyP *mpub, + unsigned int dki_len, + const struct TALER_AuditorSignatureP *asigs, + const struct TALER_DenominationKeyValidityPS *dki); /** @@ -268,14 +261,14 @@ TALER_EXCHANGEDB_auditor_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg, * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. */ int -TALER_EXCHANGEDB_auditor_write (const char *filename, - const struct TALER_AuditorPublicKeyP *apub, - const char *auditor_url, - const struct TALER_AuditorSignatureP *asigs, - const struct TALER_MasterPublicKeyP *mpub, - unsigned int dki_len, - const struct - TALER_DenominationKeyValidityPS *dki); +TALER_EXCHANGEDB_auditor_write ( + const char *filename, + const struct TALER_AuditorPublicKeyP *apub, + const char *auditor_url, + const struct TALER_AuditorSignatureP *asigs, + const struct TALER_MasterPublicKeyP *mpub, + uint32_t dki_len, + const struct TALER_DenominationKeyValidityPS *dki); /** @@ -433,9 +426,9 @@ struct TALER_EXCHANGEDB_AccountInfo * @param ai account information */ typedef void -(*TALER_EXCHANGEDB_AccountCallback)(void *cls, - const struct - TALER_EXCHANGEDB_AccountInfo *ai); +(*TALER_EXCHANGEDB_AccountCallback)( + void *cls, + const struct TALER_EXCHANGEDB_AccountInfo *ai); /** * Parse the configuration to find account information. @@ -461,12 +454,10 @@ TALER_EXCHANGEDB_find_accounts (const struct GNUNET_CONFIGURATION_Handle *cfg, * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors */ int -TALER_EXCHANGEDB_calculate_transaction_list_totals (struct - TALER_EXCHANGEDB_TransactionList - *tl, - const struct - TALER_Amount *off, - struct TALER_Amount *ret); +TALER_EXCHANGEDB_calculate_transaction_list_totals ( + struct TALER_EXCHANGEDB_TransactionList *tl, + const struct TALER_Amount *off, + struct TALER_Amount *ret); #endif diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 2511f32d4..d04914a3f 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -987,18 +987,16 @@ struct TALER_EXCHANGEDB_Session; * @return transaction status code, #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT to continue to iterate */ typedef enum GNUNET_DB_QueryStatus -(*TALER_EXCHANGEDB_DepositIterator)(void *cls, - uint64_t rowid, - const struct - TALER_MerchantPublicKeyP *merchant_pub, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_Amount *amount_with_fee, - const struct TALER_Amount *deposit_fee, - const struct - GNUNET_HashCode *h_contract_terms, - struct GNUNET_TIME_Absolute wire_deadline, - const json_t *receiver_wire_account); +(*TALER_EXCHANGEDB_DepositIterator)( + void *cls, + uint64_t rowid, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_Amount *amount_with_fee, + const struct TALER_Amount *deposit_fee, + const struct GNUNET_HashCode *h_contract_terms, + struct GNUNET_TIME_Absolute wire_deadline, + const json_t *receiver_wire_account); /** @@ -1041,24 +1039,20 @@ typedef void * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_DepositCallback)(void *cls, - uint64_t rowid, - struct GNUNET_TIME_Absolute timestamp, - const struct - TALER_MerchantPublicKeyP *merchant_pub, - const struct - TALER_DenominationPublicKey *denom_pub, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct - TALER_CoinSpendSignatureP *coin_sig, - const struct TALER_Amount *amount_with_fee, - const struct - GNUNET_HashCode *h_contract_terms, - struct GNUNET_TIME_Absolute refund_deadline, - struct GNUNET_TIME_Absolute wire_deadline, - const json_t *receiver_wire_account, - int done); +(*TALER_EXCHANGEDB_DepositCallback)( + void *cls, + uint64_t rowid, + struct GNUNET_TIME_Absolute timestamp, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_Amount *amount_with_fee, + const struct GNUNET_HashCode *h_contract_terms, + struct GNUNET_TIME_Absolute refund_deadline, + struct GNUNET_TIME_Absolute wire_deadline, + const json_t *receiver_wire_account, + int done); /** @@ -1076,20 +1070,15 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_RefreshesCallback)(void *cls, - uint64_t rowid, - const struct - TALER_DenominationPublicKey * - denom_pub, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct - TALER_CoinSpendSignatureP *coin_sig, - const struct - TALER_Amount *amount_with_fee, - uint32_t noreveal_index, - const struct - TALER_RefreshCommitmentP *rc); +(*TALER_EXCHANGEDB_RefreshesCallback)( + void *cls, + uint64_t rowid, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_Amount *amount_with_fee, + uint32_t noreveal_index, + const struct TALER_RefreshCommitmentP *rc); /** @@ -1101,9 +1090,9 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_RefundCoinCallback)(void *cls, - const struct - TALER_Amount *amount_with_fee); +(*TALER_EXCHANGEDB_RefundCoinCallback)( + void *cls, + const struct TALER_Amount *amount_with_fee); /** @@ -1152,14 +1141,13 @@ struct TALER_EXCHANGEDB_RefreshRevealedCoin * @param tp transfer public key information */ typedef void -(*TALER_EXCHANGEDB_RefreshCallback)(void *cls, - uint32_t num_freshcoins, - const struct - TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, - unsigned int num_tprivs, - const struct - TALER_TransferPrivateKeyP *tprivs, - const struct TALER_TransferPublicKeyP *tp); +(*TALER_EXCHANGEDB_RefreshCallback)( + void *cls, + uint32_t num_freshcoins, + const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, + unsigned int num_tprivs, + const struct TALER_TransferPrivateKeyP *tprivs, + const struct TALER_TransferPublicKeyP *tp); /** @@ -1178,20 +1166,16 @@ typedef void * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_RefundCallback)(void *cls, - uint64_t rowid, - const struct - TALER_DenominationPublicKey *denom_pub, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct - TALER_MerchantPublicKeyP *merchant_pub, - const struct - TALER_MerchantSignatureP *merchant_sig, - const struct - GNUNET_HashCode *h_contract_terms, - uint64_t rtransaction_id, - const struct TALER_Amount *amount_with_fee); +(*TALER_EXCHANGEDB_RefundCallback)( + void *cls, + uint64_t rowid, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct TALER_MerchantSignatureP *merchant_sig, + const struct GNUNET_HashCode *h_contract_terms, + uint64_t rtransaction_id, + const struct TALER_Amount *amount_with_fee); /** @@ -1207,15 +1191,14 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_ReserveInCallback)(void *cls, - uint64_t rowid, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_Amount *credit, - const char *sender_account_details, - uint64_t wire_reference, - struct GNUNET_TIME_Absolute - execution_date); +(*TALER_EXCHANGEDB_ReserveInCallback)( + void *cls, + uint64_t rowid, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_Amount *credit, + const char *sender_account_details, + uint64_t wire_reference, + struct GNUNET_TIME_Absolute execution_date); /** @@ -1232,18 +1215,15 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_WithdrawCallback)(void *cls, - uint64_t rowid, - const struct GNUNET_HashCode *h_blind_ev, - const struct - TALER_DenominationPublicKey *denom_pub, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct - TALER_ReserveSignatureP *reserve_sig, - struct GNUNET_TIME_Absolute execution_date, - const struct - TALER_Amount *amount_with_fee); +(*TALER_EXCHANGEDB_WithdrawCallback)( + void *cls, + uint64_t rowid, + const struct GNUNET_HashCode *h_blind_ev, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_ReserveSignatureP *reserve_sig, + struct GNUNET_TIME_Absolute execution_date, + const struct TALER_Amount *amount_with_fee); /** @@ -1255,10 +1235,10 @@ typedef int * @param ldl link data for @a transfer_pub */ typedef void -(*TALER_EXCHANGEDB_LinkCallback)(void *cls, - const struct - TALER_TransferPublicKeyP *transfer_pub, - const struct TALER_EXCHANGEDB_LinkList *ldl); +(*TALER_EXCHANGEDB_LinkCallback)( + void *cls, + const struct TALER_TransferPublicKeyP *transfer_pub, + const struct TALER_EXCHANGEDB_LinkList *ldl); /** @@ -1276,17 +1256,12 @@ typedef void * when we expect it to be done (if @a wtid was NULL) */ typedef void -(*TALER_EXCHANGEDB_WireTransferByCoinCallback)(void *cls, - const struct - TALER_WireTransferIdentifierRawP - * - wtid, - const struct - TALER_Amount *coin_contribution, - const struct - TALER_Amount *coin_fee, - struct GNUNET_TIME_Absolute - execution_time); +(*TALER_EXCHANGEDB_WireTransferByCoinCallback)( + void *cls, + const struct TALER_WireTransferIdentifierRawP *wtid, + const struct TALER_Amount *coin_contribution, + const struct TALER_Amount *coin_fee, + struct GNUNET_TIME_Absolute execution_time); /** @@ -1306,27 +1281,18 @@ typedef void * @param coin_fee applicable fee for this coin */ typedef void -(*TALER_EXCHANGEDB_AggregationDataCallback)(void *cls, - uint64_t rowid, - const struct - TALER_MerchantPublicKeyP * - merchant_pub, - const struct - GNUNET_HashCode *h_wire, - const json_t *account_details, - struct GNUNET_TIME_Absolute - exec_time, - const struct - GNUNET_HashCode *h_contract_terms, - const struct - TALER_DenominationPublicKey * - denom_pub, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct - TALER_Amount *coin_value, - const struct - TALER_Amount *coin_fee); +(*TALER_EXCHANGEDB_AggregationDataCallback)( + void *cls, + uint64_t rowid, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct GNUNET_HashCode *h_wire, + const json_t *account_details, + struct GNUNET_TIME_Absolute exec_time, + const struct GNUNET_HashCode *h_contract_terms, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_Amount *coin_value, + const struct TALER_Amount *coin_fee); /** @@ -1342,14 +1308,13 @@ typedef void * @return #GNUNET_OK to continue, #GNUNET_SYSERR to stop iteration */ typedef int -(*TALER_EXCHANGEDB_WireTransferOutCallback)(void *cls, - uint64_t rowid, - struct GNUNET_TIME_Absolute date, - const struct - TALER_WireTransferIdentifierRawP * - wtid, - const json_t *wire, - const struct TALER_Amount *amount); +(*TALER_EXCHANGEDB_WireTransferOutCallback)( + void *cls, + uint64_t rowid, + struct GNUNET_TIME_Absolute date, + const struct TALER_WireTransferIdentifierRawP *wtid, + const json_t *wire, + const struct TALER_Amount *amount); /** @@ -1386,19 +1351,16 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_RecoupCallback)(void *cls, - uint64_t rowid, - struct GNUNET_TIME_Absolute timestamp, - const struct TALER_Amount *amount, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_CoinPublicInfo *coin, - const struct - TALER_DenominationPublicKey *denom_pub, - const struct - TALER_CoinSpendSignatureP *coin_sig, - const struct - TALER_DenominationBlindingKeyP *coin_blind); +(*TALER_EXCHANGEDB_RecoupCallback)( + void *cls, + uint64_t rowid, + struct GNUNET_TIME_Absolute timestamp, + const struct TALER_Amount *amount, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_CoinPublicInfo *coin, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_DenominationBlindingKeyP *coin_blind); /** @@ -1416,24 +1378,16 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_RecoupRefreshCallback)(void *cls, - uint64_t rowid, - struct GNUNET_TIME_Absolute - timestamp, - const struct TALER_Amount *amount, - const struct - TALER_CoinSpendPublicKeyP * - old_coin_pub, - const struct - TALER_CoinPublicInfo *coin, - const struct - TALER_DenominationPublicKey * - denom_pub, - const struct - TALER_CoinSpendSignatureP *coin_sig, - const struct - TALER_DenominationBlindingKeyP * - coin_blind); +(*TALER_EXCHANGEDB_RecoupRefreshCallback)( + void *cls, + uint64_t rowid, + struct GNUNET_TIME_Absolute timestamp, + const struct TALER_Amount *amount, + const struct TALER_CoinSpendPublicKeyP *old_coin_pub, + const struct TALER_CoinPublicInfo *coin, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_DenominationBlindingKeyP *coin_blind); /** @@ -1451,19 +1405,15 @@ typedef int * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop */ typedef int -(*TALER_EXCHANGEDB_ReserveClosedCallback)(void *cls, - uint64_t rowid, - struct GNUNET_TIME_Absolute - execution_date, - const struct - TALER_Amount *amount_with_fee, - const struct - TALER_Amount *closing_fee, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const char *receiver_account, - const struct - TALER_WireTransferIdentifierRawP *wtid); +(*TALER_EXCHANGEDB_ReserveClosedCallback)( + void *cls, + uint64_t rowid, + struct GNUNET_TIME_Absolute execution_date, + const struct TALER_Amount *amount_with_fee, + const struct TALER_Amount *closing_fee, + const struct TALER_ReservePublicKeyP *reserve_pub, + const char *receiver_account, + const struct TALER_WireTransferIdentifierRawP *wtid); /** @@ -1477,13 +1427,12 @@ typedef int * @return transaction status code to pass on */ typedef enum GNUNET_DB_QueryStatus -(*TALER_EXCHANGEDB_ReserveExpiredCallback)(void *cls, - const struct - TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_Amount *left, - const char *account_details, - struct GNUNET_TIME_Absolute - expiration_date); +(*TALER_EXCHANGEDB_ReserveExpiredCallback)( + void *cls, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_Amount *left, + const char *account_details, + struct GNUNET_TIME_Absolute expiration_date); /** @@ -1499,20 +1448,14 @@ typedef enum GNUNET_DB_QueryStatus * @param amount total amount to be paid back */ typedef void -(*TALER_EXCHANGEDB_RecoupJustificationCallback)(void *cls, - uint64_t rowid, - const struct - TALER_CoinPublicInfo *coin, - const struct - TALER_CoinSpendSignatureP * - coin_sig, - const struct - TALER_DenominationBlindingKeyP - *coin_blind, - const struct - GNUNET_HashCode *h_blinded_ev, - const struct - TALER_Amount *amount); +(*TALER_EXCHANGEDB_RecoupJustificationCallback)( + void *cls, + uint64_t rowid, + const struct TALER_CoinPublicInfo *coin, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_DenominationBlindingKeyP *coin_blind, + const struct GNUNET_HashCode *h_blinded_ev, + const struct TALER_Amount *amount); /** @@ -1529,15 +1472,15 @@ typedef void * @param done did the exchange claim that it made a transfer? */ typedef void -(*TALER_EXCHANGEDB_WireMissingCallback)(void *cls, - uint64_t rowid, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_Amount *amount, - const json_t *wire, - struct GNUNET_TIME_Absolute deadline, - /* bool? */ int tiny, - /* bool? */ int done); +(*TALER_EXCHANGEDB_WireMissingCallback)( + void *cls, + uint64_t rowid, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_Amount *amount, + const json_t *wire, + struct GNUNET_TIME_Absolute deadline, + /* bool? */ int tiny, + /* bool? */ int done); /** @@ -1548,12 +1491,11 @@ typedef void * @param issue detailed information about the denomination (value, expiration times, fees) */ typedef void -(*TALER_EXCHANGEDB_DenominationCallback)(void *cls, - const struct - TALER_DenominationPublicKey *denom_pub, - const struct - TALER_EXCHANGEDB_DenominationKeyInformationP - *issue); +(*TALER_EXCHANGEDB_DenominationCallback)( + void *cls, + const struct + TALER_DenominationPublicKey *denom_pub, + const struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); /** @@ -1668,13 +1610,11 @@ struct TALER_EXCHANGEDB_Plugin * @return status of the query */ enum GNUNET_DB_QueryStatus - (*insert_denomination_info)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct - TALER_DenominationPublicKey *denom_pub, - const struct - TALER_EXCHANGEDB_DenominationKeyInformationP * - issue); + (*insert_denomination_info)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_DenominationPublicKey *denom_pub, + const struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); /** @@ -1687,11 +1627,11 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_denomination_info)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *denom_pub_hash, - struct TALER_EXCHANGEDB_DenominationKeyInformationP * - issue); + (*get_denomination_info)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *denom_pub_hash, + struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); /** @@ -2058,14 +1998,14 @@ struct TALER_EXCHANGEDB_Plugin * transaction status code on error */ enum GNUNET_DB_QueryStatus - (*iterate_matching_deposits)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *h_wire, - const struct - TALER_MerchantPublicKeyP *merchant_pub, - TALER_EXCHANGEDB_DepositIterator deposit_cb, - void *deposit_cb_cls, - uint32_t limit); + (*iterate_matching_deposits)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *h_wire, + const struct TALER_MerchantPublicKeyP *merchant_pub, + TALER_EXCHANGEDB_DepositIterator deposit_cb, + void *deposit_cb_cls, + uint32_t limit); /** @@ -2135,15 +2075,15 @@ struct TALER_EXCHANGEDB_Plugin * @return query status for the transaction */ enum GNUNET_DB_QueryStatus - (*insert_refresh_reveal)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_RefreshCommitmentP *rc, - uint32_t num_rrcs, - const struct - TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, - unsigned int num_tprivs, - const struct TALER_TransferPrivateKeyP *tprivs, - const struct TALER_TransferPublicKeyP *tp); + (*insert_refresh_reveal)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_RefreshCommitmentP *rc, + uint32_t num_rrcs, + const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs, + unsigned int num_tprivs, + const struct TALER_TransferPrivateKeyP *tprivs, + const struct TALER_TransferPublicKeyP *tp); /** @@ -2251,16 +2191,15 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*lookup_transfer_by_deposit)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct GNUNET_HashCode *h_contract_terms, - const struct GNUNET_HashCode *h_wire, - const struct - TALER_CoinSpendPublicKeyP *coin_pub, - const struct - TALER_MerchantPublicKeyP *merchant_pub, - TALER_EXCHANGEDB_WireTransferByCoinCallback cb, - void *cb_cls); + (*lookup_transfer_by_deposit)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *h_contract_terms, + const struct GNUNET_HashCode *h_wire, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + const struct TALER_MerchantPublicKeyP *merchant_pub, + TALER_EXCHANGEDB_WireTransferByCoinCallback cb, + void *cb_cls); /** @@ -2273,11 +2212,11 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_aggregation_tracking)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct - TALER_WireTransferIdentifierRawP *wtid, - unsigned long long deposit_serial_id); + (*insert_aggregation_tracking)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_WireTransferIdentifierRawP *wtid, + unsigned long long deposit_serial_id); /** @@ -2451,14 +2390,14 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*store_wire_transfer_out)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - struct GNUNET_TIME_Absolute date, - const struct - TALER_WireTransferIdentifierRawP *wtid, - const json_t *wire_account, - const char *exchange_account_section, - const struct TALER_Amount *amount); + (*store_wire_transfer_out)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + struct GNUNET_TIME_Absolute date, + const struct TALER_WireTransferIdentifierRawP *wtid, + const json_t *wire_account, + const char *exchange_account_section, + const struct TALER_Amount *amount); /** @@ -2561,15 +2500,13 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_reserves_in_above_serial_id_by_account)(void *cls, - struct - TALER_EXCHANGEDB_Session * - session, - const char *account_name, - uint64_t serial_id, - TALER_EXCHANGEDB_ReserveInCallback - cb, - void *cb_cls); + (*select_reserves_in_above_serial_id_by_account)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const char *account_name, + uint64_t serial_id, + TALER_EXCHANGEDB_ReserveInCallback cb, + void *cb_cls); /** @@ -2585,12 +2522,12 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_withdrawals_above_serial_id)(void *cls, - struct TALER_EXCHANGEDB_Session * - session, - uint64_t serial_id, - TALER_EXCHANGEDB_WithdrawCallback cb, - void *cb_cls); + (*select_withdrawals_above_serial_id)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + uint64_t serial_id, + TALER_EXCHANGEDB_WithdrawCallback cb, + void *cb_cls); /** @@ -2624,14 +2561,13 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_wire_out_above_serial_id_by_account)(void *cls, - struct TALER_EXCHANGEDB_Session - *session, - const char *account_name, - uint64_t serial_id, - TALER_EXCHANGEDB_WireTransferOutCallback - cb, - void *cb_cls); + (*select_wire_out_above_serial_id_by_account)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const char *account_name, + uint64_t serial_id, + TALER_EXCHANGEDB_WireTransferOutCallback cb, + void *cb_cls); /** @@ -2665,13 +2601,12 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_recoup_refresh_above_serial_id)(void *cls, - struct TALER_EXCHANGEDB_Session * - session, - uint64_t serial_id, - TALER_EXCHANGEDB_RecoupRefreshCallback - cb, - void *cb_cls); + (*select_recoup_refresh_above_serial_id)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + uint64_t serial_id, + TALER_EXCHANGEDB_RecoupRefreshCallback cb, + void *cb_cls); /** @@ -2686,13 +2621,12 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*select_reserve_closed_above_serial_id)(void *cls, - struct TALER_EXCHANGEDB_Session * - session, - uint64_t serial_id, - TALER_EXCHANGEDB_ReserveClosedCallback - cb, - void *cb_cls); + (*select_reserve_closed_above_serial_id)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + uint64_t serial_id, + TALER_EXCHANGEDB_ReserveClosedCallback cb, + void *cb_cls); /** @@ -2712,16 +2646,16 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction result status */ enum GNUNET_DB_QueryStatus - (*insert_recoup_request)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_ReservePublicKeyP *reserve_pub, - const struct TALER_CoinPublicInfo *coin, - const struct TALER_CoinSpendSignatureP *coin_sig, - const struct - TALER_DenominationBlindingKeyP *coin_blind, - const struct TALER_Amount *amount, - const struct GNUNET_HashCode *h_blind_ev, - struct GNUNET_TIME_Absolute timestamp); + (*insert_recoup_request)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_CoinPublicInfo *coin, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_DenominationBlindingKeyP *coin_blind, + const struct TALER_Amount *amount, + const struct GNUNET_HashCode *h_blind_ev, + struct GNUNET_TIME_Absolute timestamp); /** @@ -2740,16 +2674,15 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction result status */ enum GNUNET_DB_QueryStatus - (*insert_recoup_refresh_request)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct TALER_CoinPublicInfo *coin, - const struct - TALER_CoinSpendSignatureP *coin_sig, - const struct - TALER_DenominationBlindingKeyP *coin_blind, - const struct TALER_Amount *amount, - const struct GNUNET_HashCode *h_blind_ev, - struct GNUNET_TIME_Absolute timestamp); + (*insert_recoup_refresh_request)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct TALER_CoinPublicInfo *coin, + const struct TALER_CoinSpendSignatureP *coin_sig, + const struct TALER_DenominationBlindingKeyP *coin_blind, + const struct TALER_Amount *amount, + const struct GNUNET_HashCode *h_blind_ev, + struct GNUNET_TIME_Absolute timestamp); /** @@ -2797,12 +2730,11 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_denomination_revocation)(void *cls, - struct TALER_EXCHANGEDB_Session *session, - const struct - GNUNET_HashCode *denom_pub_hash, - const struct - TALER_MasterSignatureP *master_sig); + (*insert_denomination_revocation)( + void *cls, + struct TALER_EXCHANGEDB_Session *session, + const struct GNUNET_HashCode *denom_pub_hash, + const struct TALER_MasterSignatureP *master_sig); /** diff --git a/src/include/taler_fakebank_lib.h b/src/include/taler_fakebank_lib.h index 8601a8d8d..bd4376695 100644 --- a/src/include/taler_fakebank_lib.h +++ b/src/include/taler_fakebank_lib.h @@ -76,19 +76,19 @@ TALER_FAKEBANK_check_empty (struct TALER_FAKEBANK_Handle *h); * @param exchange_base_url exchange URL * @param request_uid unique number to make the request unique, or NULL to create one * @param[out] ret_row_id pointer to store the row ID of this transaction - * @return GNUNET_YES if the transfer was successful, - * GNUNET_SYSERR if the request_uid was reused for a different transfer + * @return #GNUNET_YES if the transfer was successful, + * #GNUNET_SYSERR if the request_uid was reused for a different transfer */ int -TALER_FAKEBANK_make_transfer (struct TALER_FAKEBANK_Handle *h, - const char *debit_account, - const char *credit_account, - const struct TALER_Amount *amount, - const struct - TALER_WireTransferIdentifierRawP *subject, - const char *exchange_base_url, - const struct GNUNET_HashCode *request_uid, - uint64_t *ret_row_id); +TALER_FAKEBANK_make_transfer ( + struct TALER_FAKEBANK_Handle *h, + const char *debit_account, + const char *credit_account, + const struct TALER_Amount *amount, + const struct TALER_WireTransferIdentifierRawP *subject, + const char *exchange_base_url, + const struct GNUNET_HashCode *request_uid, + uint64_t *ret_row_id); /** @@ -102,12 +102,12 @@ TALER_FAKEBANK_make_transfer (struct TALER_FAKEBANK_Handle *h, * @return serial_id of the transfer */ uint64_t -TALER_FAKEBANK_make_admin_transfer (struct TALER_FAKEBANK_Handle *h, - const char *debit_account, - const char *credit_account, - const struct TALER_Amount *amount, - const struct - TALER_ReservePublicKeyP *reserve_pub); +TALER_FAKEBANK_make_admin_transfer ( + struct TALER_FAKEBANK_Handle *h, + const char *debit_account, + const char *credit_account, + const struct TALER_Amount *amount, + const struct TALER_ReservePublicKeyP *reserve_pub); /** diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index c4e107c09..34d984f70 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -170,9 +170,9 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s, * @return #GNUNET_OK if signature is valid */ int -TALER_JSON_exchange_wire_signature_check (const json_t *wire_s, - const struct - TALER_MasterPublicKeyP *master_pub); +TALER_JSON_exchange_wire_signature_check ( + const json_t *wire_s, + const struct TALER_MasterPublicKeyP *master_pub); /** @@ -183,9 +183,9 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s, * @return NULL if @a payto_uri is malformed */ json_t * -TALER_JSON_exchange_wire_signature_make (const char *payto_uri, - const struct - TALER_MasterPrivateKeyP *master_priv); +TALER_JSON_exchange_wire_signature_make ( + const char *payto_uri, + const struct TALER_MasterPrivateKeyP *master_priv); /** |