taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move TALER_TrackTransferDetails to taler_crypto_lib.h as it is not exchange-specific

Browse Source
This commit is contained in:
Christian Grothoff 2016-06-09 21:03:07 +02:00
parent ecf0689c75
commit bb511560fe
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exchange-lib/exchange_api_wire_deposits.c
View File

@ -56,7 +56,7 @@ struct TALER_EXCHANGE_TrackTransferHandle
/** /**
* Function to call with the result. * Function to call with the result.
*/ */
TALER_EXCHANGE_WireDepositsCallback cb; TALER_EXCHANGE_TrackTransferCallback cb;
/** /**
* Closure for @a cb. * Closure for @a cb.
@ -245,7 +245,7 @@ handle_wire_deposits_finished (void *cls,
struct TALER_EXCHANGE_TrackTransferHandle * struct TALER_EXCHANGE_TrackTransferHandle *
TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange, TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_WireTransferIdentifierRawP *wtid,
TALER_EXCHANGE_WireDepositsCallback cb, TALER_EXCHANGE_TrackTransferCallback cb,
void *cb_cls) void *cb_cls)
{ {
struct TALER_EXCHANGE_TrackTransferHandle *wdh; struct TALER_EXCHANGE_TrackTransferHandle *wdh;

34
src/include/taler_crypto_lib.h
View File

@ -354,6 +354,40 @@ struct TALER_CoinPublicInfo
}; };
/**
* Details for one of the /deposit operations that the
* exchange combined into a single wire transfer.
*/
struct TALER_TrackTransferDetails
{
/**
* Hash of the contract.
*/
struct GNUNET_HashCode h_contract;
/**
* Which coin was deposited?
*/
struct TALER_CoinSpendPublicKeyP coin_pub;
/**
* Value of the deposit (including fee).
*/
struct TALER_Amount coin_value;
/**
* Fee charged by the exchange for the deposit.
*/
struct TALER_Amount coin_fee;
/**
* Merchant's transaction identifier.
*/
uint64_t transaction_id;
};
/** /**
* Check if a coin is valid; that is, whether the denomination key exists, * Check if a coin is valid; that is, whether the denomination key exists,
* is not expired, and the signature is correct. * is not expired, and the signature is correct.

52
src/include/taler_exchange_service.h
View File

@ -1101,40 +1101,6 @@ TALER_EXCHANGE_admin_add_incoming_cancel (struct TALER_EXCHANGE_AdminAddIncoming
struct TALER_EXCHANGE_TrackTransferHandle; struct TALER_EXCHANGE_TrackTransferHandle;
/**
* Details for one of the /deposit operations that the
* exchange combined into a single wire transfer.
*/
struct TALER_TrackTransferDetails
{
/**
* Hash of the contract.
*/
struct GNUNET_HashCode h_contract;
/**
* Which coin was deposited?
*/
struct TALER_CoinSpendPublicKeyP coin_pub;
/**
* Value of the deposit (including fee).
*/
struct TALER_Amount coin_value;
/**
* Fee charged by the exchange for the deposit.
*/
struct TALER_Amount coin_fee;
/**
* Merchant's transaction identifier.
*/
uint64_t transaction_id;
};
/** /**
* Function called with detailed wire transfer data, including all * Function called with detailed wire transfer data, including all
* of the coin transactions that were combined into the wire transfer. * of the coin transactions that were combined into the wire transfer.
@ -1152,14 +1118,14 @@ struct TALER_TrackTransferDetails
* @param details array with details about the combined transactions * @param details array with details about the combined transactions
*/ */
typedef void typedef void
(*TALER_EXCHANGE_WireDepositsCallback)(void *cls, (*TALER_EXCHANGE_TrackTransferCallback)(void *cls,
unsigned int http_status, unsigned int http_status,
const struct TALER_ExchangePublicKeyP *sign_key, const struct TALER_ExchangePublicKeyP *sign_key,
const json_t *json, const json_t *json,
const struct GNUNET_HashCode *h_wire, const struct GNUNET_HashCode *h_wire,
const struct TALER_Amount *total_amount, const struct TALER_Amount *total_amount,
unsigned int details_length, unsigned int details_length,
const struct TALER_TrackTransferDetails *details); const struct TALER_TrackTransferDetails *details);
/** /**
@ -1175,7 +1141,7 @@ typedef void
struct TALER_EXCHANGE_TrackTransferHandle * struct TALER_EXCHANGE_TrackTransferHandle *
TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange, TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_WireTransferIdentifierRawP *wtid,
TALER_EXCHANGE_WireDepositsCallback cb, TALER_EXCHANGE_TrackTransferCallback cb,
void *cb_cls); void *cb_cls);