summaryrefslogtreecommitdiff
path: root/src/backenddb/plugin_merchantdb_postgres.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c69
1 files changed, 35 insertions, 34 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 7aad3c7c..834b73a3 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -838,7 +838,7 @@ struct KycStatusContext
/**
* Filter, NULL to not filter.
*/
- const struct TALER_MerchantWireHash *h_wire;
+ const struct TALER_MerchantWireHashP *h_wire;
/**
* Filter, NULL to not filter.
@@ -874,7 +874,7 @@ kyc_status_cb (void *cls,
for (unsigned int i = 0; i < num_results; i++)
{
- struct TALER_MerchantWireHash h_wire;
+ struct TALER_MerchantWireHashP h_wire;
uint64_t kyc_serial;
char *exchange_url;
char *payto_uri;
@@ -948,7 +948,7 @@ kyc_status_cb (void *cls,
static enum GNUNET_DB_QueryStatus
postgres_account_kyc_get_status (void *cls,
const char *merchant_id,
- const struct TALER_MerchantWireHash *h_wire,
+ const struct TALER_MerchantWireHashP *h_wire,
const char *exchange_url,
TALER_MERCHANTDB_KycCallback kyc_cb,
void *kyc_cb_cls)
@@ -1001,7 +1001,7 @@ static enum GNUNET_DB_QueryStatus
postgres_account_kyc_set_status (
void *cls,
const char *merchant_id,
- const struct TALER_MerchantWireHash *h_wire,
+ const struct TALER_MerchantWireHashP *h_wire,
const char *exchange_url,
uint64_t exchange_kyc_serial,
const struct TALER_ExchangeSignatureP *exchange_sig,
@@ -1158,7 +1158,7 @@ postgres_update_instance_auth (
static enum GNUNET_DB_QueryStatus
postgres_inactivate_account (void *cls,
const char *merchant_id,
- const struct TALER_MerchantWireHash *h_wire)
+ const struct TALER_MerchantWireHashP *h_wire)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -1185,7 +1185,7 @@ postgres_inactivate_account (void *cls,
static enum GNUNET_DB_QueryStatus
postgres_activate_account (void *cls,
const char *merchant_id,
- const struct TALER_MerchantWireHash *h_wire)
+ const struct TALER_MerchantWireHashP *h_wire)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -2053,7 +2053,7 @@ postgres_insert_contract_terms (void *cls,
struct GNUNET_TIME_Timestamp pay_deadline;
struct GNUNET_TIME_Timestamp refund_deadline;
const char *fulfillment_url;
- struct TALER_PrivateContractHash h_contract_terms;
+ struct TALER_PrivateContractHashP h_contract_terms;
if (GNUNET_OK !=
TALER_JSON_contract_hash (contract_terms,
@@ -2133,7 +2133,7 @@ postgres_update_contract_terms (void *cls,
struct GNUNET_TIME_Timestamp pay_deadline;
struct GNUNET_TIME_Timestamp refund_deadline;
const char *fulfillment_url = NULL;
- struct TALER_PrivateContractHash h_contract_terms;
+ struct TALER_PrivateContractHashP h_contract_terms;
if (GNUNET_OK !=
TALER_JSON_contract_hash (contract_terms,
@@ -2325,12 +2325,12 @@ lookup_deposits_cb (void *cls,
* @return transaction status
*/
static enum GNUNET_DB_QueryStatus
-postgres_lookup_deposits (void *cls,
- const char *instance_id,
- const struct
- TALER_PrivateContractHash *h_contract_terms,
- TALER_MERCHANTDB_DepositsCallback cb,
- void *cb_cls)
+postgres_lookup_deposits (
+ void *cls,
+ const char *instance_id,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
+ TALER_MERCHANTDB_DepositsCallback cb,
+ void *cb_cls)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -2425,14 +2425,14 @@ postgres_insert_deposit (
void *cls,
const char *instance_id,
struct GNUNET_TIME_Timestamp deposit_timestamp,
- const struct TALER_PrivateContractHash *h_contract_terms,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
const char *exchange_url,
const struct TALER_Amount *amount_with_fee,
const struct TALER_Amount *deposit_fee,
const struct TALER_Amount *refund_fee,
const struct TALER_Amount *wire_fee,
- const struct TALER_MerchantWireHash *h_wire,
+ const struct TALER_MerchantWireHashP *h_wire,
const struct TALER_ExchangeSignatureP *exchange_sig,
const struct TALER_ExchangePublicKeyP *exchange_pub)
{
@@ -2552,12 +2552,12 @@ lookup_refunds_cb (void *cls,
* @return transaction status
*/
static enum GNUNET_DB_QueryStatus
-postgres_lookup_refunds (void *cls,
- const char *instance_id,
- const struct
- TALER_PrivateContractHash *h_contract_terms,
- TALER_MERCHANTDB_RefundCallback rc,
- void *rc_cls)
+postgres_lookup_refunds (
+ void *cls,
+ const char *instance_id,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
+ TALER_MERCHANTDB_RefundCallback rc,
+ void *rc_cls)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -2600,11 +2600,11 @@ postgres_lookup_refunds (void *cls,
* @return transaction status
*/
static enum GNUNET_DB_QueryStatus
-postgres_mark_contract_paid (void *cls,
- const char *instance_id,
- const struct
- TALER_PrivateContractHash *h_contract_terms,
- const char *session_id)
+postgres_mark_contract_paid (
+ void *cls,
+ const char *instance_id,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
+ const char *session_id)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -2664,7 +2664,7 @@ postgres_mark_contract_paid (void *cls,
static enum GNUNET_DB_QueryStatus
postgres_refund_coin (void *cls,
const char *instance_id,
- const struct TALER_PrivateContractHash *h_contract_terms,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
struct GNUNET_TIME_Timestamp refund_timestamp,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
const char *reason)
@@ -2699,7 +2699,8 @@ static enum GNUNET_DB_QueryStatus
postgres_lookup_order_status (void *cls,
const char *instance_id,
const char *order_id,
- struct TALER_PrivateContractHash *h_contract_terms,
+ struct TALER_PrivateContractHashP *
+ h_contract_terms,
bool *paid)
{
struct PostgresClosure *pg = cls;
@@ -2747,7 +2748,7 @@ postgres_lookup_order_status_by_serial (void *cls,
const char *instance_id,
uint64_t order_serial,
char **order_id,
- struct TALER_PrivateContractHash *
+ struct TALER_PrivateContractHashP *
h_contract_terms,
bool *paid)
{
@@ -2898,7 +2899,7 @@ lookup_deposits_by_order_cb (void *cls,
{
uint64_t deposit_serial;
char *exchange_url;
- struct TALER_MerchantWireHash h_wire;
+ struct TALER_MerchantWireHashP h_wire;
struct TALER_CoinSpendPublicKeyP coin_pub;
struct TALER_Amount amount_with_fee;
struct TALER_Amount deposit_fee;
@@ -3723,7 +3724,7 @@ static enum GNUNET_DB_QueryStatus
postgres_lookup_refunds_detailed (
void *cls,
const char *instance_id,
- const struct TALER_PrivateContractHash *h_contract_terms,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
TALER_MERCHANTDB_RefundDetailCallback rc,
void *rc_cls)
{
@@ -4311,7 +4312,7 @@ lookup_deposits_by_contract_and_coin_cb (void *cls,
struct TALER_Amount deposit_fee;
struct TALER_Amount refund_fee;
struct TALER_Amount wire_fee;
- struct TALER_MerchantWireHash h_wire;
+ struct TALER_MerchantWireHashP h_wire;
struct GNUNET_TIME_Timestamp deposit_timestamp;
struct GNUNET_TIME_Timestamp refund_deadline;
struct TALER_ExchangeSignatureP exchange_sig;
@@ -4382,7 +4383,7 @@ static enum GNUNET_DB_QueryStatus
postgres_lookup_deposits_by_contract_and_coin (
void *cls,
const char *instance_id,
- const struct TALER_PrivateContractHash *h_contract_terms,
+ const struct TALER_PrivateContractHashP *h_contract_terms,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
TALER_MERCHANTDB_CoinDepositCallback cb,
void *cb_cls)