diff options
Diffstat (limited to 'src/include/taler_merchantdb_plugin.h')
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index cdd5aacd..84ced310 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -145,7 +145,7 @@ struct TALER_MERCHANTDB_AccountDetails /** * Actual account address as a payto://-URI. */ - char *payto_uri; + struct TALER_FullPayto payto_uri; /** * Where can the taler-merchant-wirewatch helper @@ -880,7 +880,7 @@ typedef void (*TALER_MERCHANTDB_KycCallback)( void *cls, const struct TALER_MerchantWireHashP *h_wire, - const char *payto_uri, + struct TALER_FullPayto payto_uri, const char *exchange_url, struct GNUNET_TIME_Timestamp last_check, bool kyc_ok, @@ -970,7 +970,7 @@ typedef void uint64_t rowid, const char *instance_id, const char *exchange_url, - const char *payto_uri, + struct TALER_FullPayto payto_uri, const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_Amount *total, struct GNUNET_TIME_Absolute next_attempt); @@ -1035,7 +1035,7 @@ typedef void (*TALER_MERCHANTDB_WirewatchWorkCallback)( void *cls, const char *instance, - const char *payto_uri, + struct TALER_FullPayto payto_uri, const char *credit_facade_url, const json_t *credit_facade_credentials, uint64_t last_serial); @@ -1062,7 +1062,7 @@ typedef void void *cls, const struct TALER_Amount *credit_amount, const struct TALER_WireTransferIdentifierRawP *wtid, - const char *payto_uri, + struct TALER_FullPayto payto_uri, const char *exchange_url, uint64_t transfer_serial_id, struct GNUNET_TIME_Timestamp execution_time, @@ -1084,7 +1084,7 @@ typedef void typedef void (*TALER_MERCHANTDB_ExchangeAccountCallback) ( void *cls, - const char *payto_uri, + struct TALER_FullPayto payto_uri, const char *conversion_url, const json_t *debit_restrictions, const json_t *credit_restrictions, @@ -1655,7 +1655,7 @@ struct TALER_MERCHANTDB_Plugin (*select_account_by_uri)( void *cls, const char *id, - const char *payto_uri, + struct TALER_FullPayto payto_uri, struct TALER_MERCHANTDB_AccountDetails *ad); @@ -1779,7 +1779,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*get_kyc_status)( void *cls, - const char *merchant_account_uri, + struct TALER_FullPayto merchant_account_uri, const char *instance_id, const char *exchange_url, bool *auth_ok, @@ -1806,7 +1806,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*get_kyc_limits)( void *cls, - const char *merchant_account_uri, + struct TALER_FullPayto merchant_account_uri, const char *instance_id, const char *exchange_url, bool *kyc_ok, @@ -2794,7 +2794,7 @@ struct TALER_MERCHANTDB_Plugin (*update_wirewatch_progress)( void *cls, const char *instance, - const char *payto_uri, + struct TALER_FullPayto payto_uri, uint64_t last_serial); @@ -2833,7 +2833,7 @@ struct TALER_MERCHANTDB_Plugin const char *exchange_url, const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_Amount *credit_amount, - const char *payto_uri, + struct TALER_FullPayto payto_uri, bool confirmed); @@ -2881,7 +2881,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*lookup_account)(void *cls, const char *instance_id, - const char *payto_uri, + struct TALER_FullPayto payto_uri, uint64_t *account_serial); @@ -2903,7 +2903,7 @@ struct TALER_MERCHANTDB_Plugin void *cls, const char *instance_id, const char *exchange_url, - const char *payto_uri, + struct TALER_FullPayto payto_uri, const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_EXCHANGE_TransferData *td); @@ -2962,7 +2962,6 @@ struct TALER_MERCHANTDB_Plugin * @param cls closure * @param instance_id the instance to look up details at * @param exchange_url the exchange that made the transfer - * @param payto_uri account that received the transfer * @param wtid wire transfer subject * @param[out] total_amount amount that was debited from our * aggregate balance at the exchange (in total, sum of @@ -3011,9 +3010,7 @@ struct TALER_MERCHANTDB_Plugin * Lookup transfer summary (used if we already verified the details). * * @param cls closure - * @param instance_id instance to lookup payments for * @param exchange_url the exchange that made the transfer - * @param payto_uri account that received the transfer * @param wtid wire transfer subject * @param cb function to call with detailed transfer data * @param cb_cls closure for @a cb @@ -3032,9 +3029,7 @@ struct TALER_MERCHANTDB_Plugin * Lookup transfer details. Used if we still need to verify the details. * * @param cls closure - * @param instance_id instance to lookup payments for * @param exchange_url the exchange that made the transfer - * @param payto_uri account that received the transfer * @param wtid wire transfer subject * @param cb function to call with detailed transfer data * @param cb_cls closure for @a cb @@ -3069,7 +3064,7 @@ struct TALER_MERCHANTDB_Plugin (*lookup_transfers)( void *cls, const char *instance_id, - const char *payto_uri, + struct TALER_FullPayto payto_uri, struct GNUNET_TIME_Timestamp before, struct GNUNET_TIME_Timestamp after, int64_t limit, @@ -3149,7 +3144,7 @@ struct TALER_MERCHANTDB_Plugin (*insert_exchange_account)( void *cls, const struct TALER_MasterPublicKeyP *master_pub, - const char *payto_uri, + const struct TALER_FullPayto payto_uri, const char *conversion_url, const json_t *debit_restrictions, const json_t *credit_restrictions, |