diff options
Diffstat (limited to 'src')
37 files changed, 178 insertions, 177 deletions
diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h index b865dcc7..847701a1 100644 --- a/src/backend/taler-merchant-httpd.h +++ b/src/backend/taler-merchant-httpd.h @@ -68,7 +68,7 @@ struct TMH_WireMethod /** * Hash of our wire format details as given in #j_wire. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Is this wire method active (should it be included in new contracts)? diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c index 9748f469..c563f7c2 100644 --- a/src/backend/taler-merchant-httpd_get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_get-orders-ID.c @@ -47,7 +47,7 @@ struct GetOrderData /** * Hashed version of contract terms. All zeros if not provided. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Claim token used for access control. All zeros if not provided. @@ -366,7 +366,7 @@ TMH_make_order_status_url (struct MHD_Connection *con, const char *session_id, const char *instance_id, struct TALER_ClaimTokenP *claim_token, - struct TALER_PrivateContractHash *h_contract) + struct TALER_PrivateContractHashP *h_contract) { const char *host; const char *forwarded_host; @@ -1052,7 +1052,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, /* Check if client provided the right hash code of the contract terms */ if (NULL != god->contract_terms) { - struct TALER_PrivateContractHash h; + struct TALER_PrivateContractHashP h; contract_available = true; if (GNUNET_OK != @@ -1308,7 +1308,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, { /* Check if paid. */ - struct TALER_PrivateContractHash h_contract; + struct TALER_PrivateContractHashP h_contract; bool paid; qs = TMH_db->lookup_order_status (TMH_db->cls, diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.h b/src/backend/taler-merchant-httpd_get-orders-ID.h index a09d40a3..97b8525b 100644 --- a/src/backend/taler-merchant-httpd_get-orders-ID.h +++ b/src/backend/taler-merchant-httpd_get-orders-ID.h @@ -67,7 +67,7 @@ TMH_make_order_status_url (struct MHD_Connection *con, const char *session_id, const char *instance_id, struct TALER_ClaimTokenP *claim_token, - struct TALER_PrivateContractHash *h_contract); + struct TALER_PrivateContractHashP *h_contract); /** diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c index 4c5f0313..d0fcfbc0 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c @@ -126,7 +126,7 @@ struct AbortContext /** * Hashed contract terms (according to client). */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Context for our operation. @@ -746,7 +746,7 @@ begin_transaction (struct AbortContext *ac) /* check payment was indeed incomplete (now that we are in the transaction scope!) */ { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; bool paid; qs = TMH_db->lookup_order_status (TMH_db->cls, diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-paid.c b/src/backend/taler-merchant-httpd_post-orders-ID-paid.c index 7b1a7863..0e7ea59e 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-paid.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-paid.c @@ -151,7 +151,7 @@ TMH_post_orders_ID_paid (const struct TMH_RequestHandler *rh, } { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; if (GNUNET_OK != TALER_JSON_contract_hash (contract_terms, diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c index 5ee70de9..edd37d24 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -83,7 +83,7 @@ struct DepositConfirmation /** * Hash of the denomination of this coin. */ - struct TALER_DenominationHash h_denom; + struct TALER_DenominationHashP h_denom; /** * Amount this coin contributes to the total purchase price. @@ -225,13 +225,13 @@ struct PayContext /** * Hashed proposal. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * "h_wire" from @e contract_terms. Used to identify * the instance's wire transfer method. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Maximum fee the merchant is willing to pay, from @e root. @@ -409,7 +409,7 @@ struct KycContext /** * Contract we are looking up. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Coin we are looking up. @@ -786,7 +786,7 @@ process_kyc_with_exchange (void *cls, static void kyc_cb ( void *cls, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, uint64_t exchange_kyc_serial, const char *payto_uri, const char *exchange_url, diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-refund.c b/src/backend/taler-merchant-httpd_post-orders-ID-refund.c index a80e1446..b6aebf71 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-refund.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-refund.c @@ -134,7 +134,7 @@ struct PostRefundData /** * Hashed version of contract terms. All zeros if not provided. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * DLL of (suspended) requests. @@ -624,7 +624,7 @@ TMH_post_orders_ID_refund (const struct TMH_RequestHandler *rh, hc->infix); } { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; if (GNUNET_OK != TALER_JSON_contract_hash (contract_terms, diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c index 03f799a9..e4edfe34 100644 --- a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c +++ b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c @@ -71,7 +71,7 @@ struct ExchangeKycRequest /** * Hash of the wire account (with salt) we are checking. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Handle for the actual HTTP request to the exchange. @@ -179,7 +179,7 @@ struct KycContext * Set to the h_wire of the merchant account if * @a have_h_wire is true, used to filter by account. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * How long are we willing to wait for the exchange(s)? @@ -523,7 +523,7 @@ kyc_with_exchange (void *cls, { struct ExchangeKycRequest *ekr = cls; struct KycContext *kc = ekr->kc; - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; ekr->fo = NULL; TALER_payto_hash (ekr->payto_uri, @@ -551,7 +551,7 @@ kyc_with_exchange (void *cls, */ static void kyc_status_cb (void *cls, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, uint64_t exchange_kyc_serial, const char *payto_uri, const char *exchange_url, diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c index 5cfba15e..6ef119c5 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c @@ -83,7 +83,7 @@ struct TransferQuery /** * Hash of the merchant's bank account the transfer (presumably) went to. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Value deposited (including deposit fee). @@ -200,7 +200,7 @@ struct GetOrderRequestContext /** * Hash over the @e contract_terms. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Total amount the exchange deposited into our bank account @@ -677,7 +677,7 @@ static void deposit_cb (void *cls, uint64_t deposit_serial, const char *exchange_url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *deposit_fee, const struct TALER_CoinSpendPublicKeyP *coin_pub) @@ -1444,7 +1444,7 @@ TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh, } { - struct TALER_PrivateContractHash *h_contract = NULL; + struct TALER_PrivateContractHashP *h_contract = NULL; /* In a session-bound payment, allow the browser to check the order * status page (e.g. to get a refund). diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c index 444e564d..04fd8bbd 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders.c +++ b/src/backend/taler-merchant-httpd_private-get-orders.c @@ -274,7 +274,7 @@ add_order (void *cls, { struct TMH_PendingOrder *po = cls; json_t *contract_terms = NULL; - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; enum GNUNET_DB_QueryStatus qs; const char *summary; char *order_id = NULL; diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c index fe120212..96352a93 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c +++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c @@ -150,7 +150,7 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh, GNUNET_JSON_spec_end () }; enum TALER_MERCHANTDB_RefundStatus rs; - struct TALER_PrivateContractHash h_contract; + struct TALER_PrivateContractHashP h_contract; { enum GNUNET_DB_QueryStatus qs; diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c index d144c53c..baaf3de9 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders.c +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -1059,7 +1059,7 @@ patch_order (struct MHD_Connection *connection, /* sanity check result */ { - struct TALER_PrivateContractHash h_control; + struct TALER_PrivateContractHashP h_control; switch (TALER_JSON_contract_hash (order, &h_control)) diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c index b6745c55..83742d01 100644 --- a/src/backend/taler-merchant-httpd_private-post-transfers.c +++ b/src/backend/taler-merchant-httpd_private-post-transfers.c @@ -303,7 +303,7 @@ check_transfer (void *cls, 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, struct GNUNET_TIME_Timestamp deposit_timestamp, struct GNUNET_TIME_Timestamp refund_deadline, const struct TALER_ExchangeSignatureP *exchange_sig, 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) diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c index ba222ee3..b30c88eb 100644 --- a/src/backenddb/test_merchantdb.c +++ b/src/backenddb/test_merchantdb.c @@ -1750,7 +1750,7 @@ test_mark_contract_paid (const struct InstanceData *instance, const struct OrderData *order, enum GNUNET_DB_QueryStatus expected_result) { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; GNUNET_assert (GNUNET_OK == TALER_JSON_contract_hash (order->contract, @@ -1778,8 +1778,8 @@ test_lookup_order_status (const struct InstanceData *instance, const struct OrderData *order, bool expected_paid) { - struct TALER_PrivateContractHash h_contract_terms_expected; - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms_expected; + struct TALER_PrivateContractHashP h_contract_terms; bool order_paid = false; if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != @@ -2097,7 +2097,7 @@ run_test_orders (struct TestOrders_Closure *cls) &cls->orders[0], false)); { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; bool order_paid = false; if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != @@ -2130,7 +2130,7 @@ run_test_orders (struct TestOrders_Closure *cls) } /* Test lookup order status fails for nonexistent order */ { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; bool order_paid; if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != @@ -2367,7 +2367,7 @@ struct DepositData /** * Hash of the associated order's contract terms. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Public key of the coin that has been deposited. @@ -2402,7 +2402,7 @@ struct DepositData /** * Hash of the wire details. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Signature the exchange made on this deposit. @@ -2635,7 +2635,7 @@ lookup_deposits_cb (void *cls, */ static int test_lookup_deposits (const struct InstanceData *instance, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, unsigned int deposits_length, const struct DepositData *deposits) { @@ -2699,7 +2699,7 @@ lookup_deposits_contract_coin_cb ( 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, struct GNUNET_TIME_Timestamp deposit_timestamp, struct GNUNET_TIME_Timestamp refund_deadline, const struct TALER_ExchangeSignatureP *exchange_sig, @@ -2761,7 +2761,7 @@ lookup_deposits_contract_coin_cb ( static int test_lookup_deposits_contract_and_coin ( const struct InstanceData *instance, - const struct TALER_PrivateContractHash *h_contract, + const struct TALER_PrivateContractHashP *h_contract, const struct TALER_CoinSpendPublicKeyP *coin_pub, unsigned int deposits_length, const struct DepositData *deposits) @@ -2821,7 +2821,7 @@ static void lookup_deposits_order_cb (void *cls, uint64_t deposit_serial, const char *exchange_url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *deposit_fee, const struct TALER_CoinSpendPublicKeyP *coin_pub) @@ -2938,7 +2938,7 @@ static void get_deposit_serial_cb (void *cls, uint64_t deposit_serial, const char *exchange_url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *deposit_fee, const struct TALER_CoinSpendPublicKeyP *coin_pub) @@ -5725,7 +5725,7 @@ lookup_refunds_cb (void *cls, */ static int test_lookup_refunds (const struct InstanceData *instance, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, unsigned int refunds_length, const struct TALER_CoinSpendPublicKeyP *coin_pubs, const struct TALER_Amount *refund_amounts) @@ -6048,7 +6048,7 @@ get_refund_serial_cb (void *cls, */ static uint64_t get_refund_serial (const struct InstanceData *instance, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct RefundData *refund) { struct LookupRefundSerial_Closure lookup_cls = { @@ -6684,7 +6684,7 @@ test_lookup_orders_all_filters (void) static void kyc_status_ok (void *cls, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, uint64_t exchange_kyc_serial, const char *payto_uri, const char *exchange_url, @@ -6700,7 +6700,7 @@ kyc_status_ok (void *cls, static void kyc_status_fail (void *cls, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, uint64_t exchange_kyc_serial, const char *payto_uri, const char *exchange_url, diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 408020b3..660f1024 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -689,7 +689,7 @@ struct TALER_MERCHANT_Account /** * Hash of @e payto_uri and @e salt. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * true if the account is active, @@ -1651,17 +1651,17 @@ typedef void * @return handle for this operation, NULL upon errors */ struct TALER_MERCHANT_OrderWalletGetHandle * -TALER_MERCHANT_wallet_order_get (struct GNUNET_CURL_Context *ctx, - const char *backend_url, - const char *order_id, - const struct - TALER_PrivateContractHash *h_contract, - struct GNUNET_TIME_Relative timeout, - const char *session_id, - const struct TALER_Amount *min_refund, - bool await_refund_obtained, - TALER_MERCHANT_OrderWalletGetCallback cb, - void *cb_cls); +TALER_MERCHANT_wallet_order_get ( + struct GNUNET_CURL_Context *ctx, + const char *backend_url, + const char *order_id, + const struct TALER_PrivateContractHashP *h_contract, + struct GNUNET_TIME_Relative timeout, + const char *session_id, + const struct TALER_Amount *min_refund, + bool await_refund_obtained, + TALER_MERCHANT_OrderWalletGetCallback cb, + void *cb_cls); /** * Cancel a GET /orders/$ID request. @@ -2072,7 +2072,7 @@ typedef void const struct TALER_MERCHANT_HttpResponse *hr, const json_t *contract_terms, const struct TALER_MerchantSignatureP *sig, - const struct TALER_PrivateContractHash *h_contract_terms); + const struct TALER_PrivateContractHashP *h_contract_terms); /** @@ -2286,7 +2286,7 @@ struct TALER_MERCHANT_OrderPayHandle * TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx, const char *merchant_url, const char *session_id, - const struct TALER_PrivateContractHash *h_contract, + const struct TALER_PrivateContractHashP *h_contract, const struct TALER_Amount *amount, const struct TALER_Amount *max_fee, const struct TALER_MerchantPublicKeyP *merchant_pub, @@ -2294,7 +2294,7 @@ TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx, struct GNUNET_TIME_Timestamp timestamp, struct GNUNET_TIME_Timestamp refund_deadline, struct GNUNET_TIME_Timestamp pay_deadline, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const char *order_id, unsigned int num_coins, const struct TALER_MERCHANT_PayCoin coins[], @@ -2358,7 +2358,7 @@ TALER_MERCHANT_order_paid ( const char *merchant_url, const char *order_id, const char *session_id, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_MerchantSignatureP *merchant_sig, TALER_MERCHANT_OrderPaidCallback paid_cb, void *paid_cb_cls); @@ -2462,7 +2462,7 @@ TALER_MERCHANT_order_abort (struct GNUNET_CURL_Context *ctx, const char *merchant_url, const char *order_id, const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_PrivateContractHash *h_contract, + const struct TALER_PrivateContractHashP *h_contract, unsigned int num_coins, const struct TALER_MERCHANT_AbortCoin coins[], TALER_MERCHANT_AbortCallback cb, @@ -2554,7 +2554,7 @@ typedef void void *cls, const struct TALER_MERCHANT_HttpResponse *hr, const char *taler_refund_uri, - const struct TALER_PrivateContractHash *h_contract); + const struct TALER_PrivateContractHashP *h_contract); /** @@ -2670,7 +2670,7 @@ TALER_MERCHANT_wallet_post_order_refund ( struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *order_id, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, TALER_MERCHANT_WalletRefundCallback cb, void *cb_cls); @@ -3893,7 +3893,7 @@ typedef void struct TALER_MERCHANT_KycGetHandle * TALER_MERCHANT_kyc_get (struct GNUNET_CURL_Context *ctx, const char *backend_url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const char *exchange_url, struct GNUNET_TIME_Relative timeout, TALER_MERCHANT_KycGetCallback cb, @@ -3918,7 +3918,7 @@ struct TALER_MERCHANT_KycGetHandle * TALER_MERCHANT_management_kyc_get (struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *instance_id, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const char *exchange_url, struct GNUNET_TIME_Relative timeout, TALER_MERCHANT_KycGetCallback cb, diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index b2a50588..64e37c72 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -1523,8 +1523,8 @@ TALER_TESTING_cmd_merchant_kyc_get (const char *label, op (pay_delay, const struct GNUNET_TIME_Relative) \ op (refund_entry, const struct TALER_MERCHANT_RefundDetail) \ op (order_terms, const json_t) \ - op (h_contract_terms, const struct TALER_PrivateContractHash) \ - op (h_wire, const struct TALER_MerchantWireHash) \ + op (h_contract_terms, const struct TALER_PrivateContractHashP) \ + op (h_wire, const struct TALER_MerchantWireHashP) \ op (proposal_reference, const char *) diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index e37c9f72..fcd62fb3 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -85,7 +85,7 @@ struct TALER_MERCHANTDB_AccountDetails /** * Hash of the wire details (@e payto_uri and @e salt). */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Salt value used for hashing @e payto_uri. @@ -447,7 +447,7 @@ typedef void typedef void (*TALER_MERCHANTDB_KycCallback)( void *cls, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, uint64_t exchange_kyc_serial, const char *payto_uri, const char *exchange_url, @@ -633,7 +633,7 @@ typedef void void *cls, uint64_t deposit_serial, const char *exchange_url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *deposit_fee, const struct TALER_CoinSpendPublicKeyP *coin_pub); @@ -711,7 +711,7 @@ typedef void 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, struct GNUNET_TIME_Timestamp deposit_timestamp, struct GNUNET_TIME_Timestamp refund_deadline, const struct TALER_ExchangeSignatureP *exchange_sig, @@ -1018,7 +1018,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*inactivate_account)(void *cls, const char *merchant_id, - const struct TALER_MerchantWireHash *h_wire); + const struct TALER_MerchantWireHashP *h_wire); /** @@ -1032,7 +1032,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*activate_account)(void *cls, const char *merchant_id, - const struct TALER_MerchantWireHash *h_wire); + const struct TALER_MerchantWireHashP *h_wire); /** @@ -1051,7 +1051,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*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); @@ -1073,7 +1073,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*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, @@ -1430,7 +1430,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*lookup_deposits)(void *cls, const char *instance_id, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, TALER_MERCHANTDB_DepositsCallback cb, void *cb_cls); @@ -1478,14 +1478,14 @@ struct TALER_MERCHANTDB_Plugin (*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); @@ -1503,7 +1503,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*lookup_refunds)(void *cls, const char *instance_id, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, TALER_MERCHANTDB_RefundCallback rc, void *rc_cls); @@ -1520,11 +1520,11 @@ struct TALER_MERCHANTDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*mark_contract_paid)(void *cls, - const char *instance_id, - const struct - TALER_PrivateContractHash *h_contract_terms, - const char *session_id); + (*mark_contract_paid)( + void *cls, + const char *instance_id, + const struct TALER_PrivateContractHashP *h_contract_terms, + const char *session_id); /** @@ -1545,7 +1545,7 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*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); @@ -1565,7 +1565,7 @@ struct TALER_MERCHANTDB_Plugin (*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); /** @@ -1584,7 +1584,7 @@ struct TALER_MERCHANTDB_Plugin const char *instance_id, uint64_t order_serial, char **order_id, - struct TALER_PrivateContractHash * + struct TALER_PrivateContractHashP * h_contract_terms, bool *paid); @@ -1706,12 +1706,12 @@ struct TALER_MERCHANTDB_Plugin * @return transaction status */ enum GNUNET_DB_QueryStatus - (*lookup_refunds_detailed)(void *cls, - const char *instance_id, - const struct - TALER_PrivateContractHash *h_contract_terms, - TALER_MERCHANTDB_RefundDetailCallback rc, - void *rc_cls); + (*lookup_refunds_detailed)( + void *cls, + const char *instance_id, + const struct TALER_PrivateContractHashP *h_contract_terms, + TALER_MERCHANTDB_RefundDetailCallback rc, + void *rc_cls); /** * Insert refund proof data from the exchange into the database. @@ -1903,7 +1903,7 @@ struct TALER_MERCHANTDB_Plugin (*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); diff --git a/src/lib/merchant_api_get_kyc.c b/src/lib/merchant_api_get_kyc.c index e5ead431..2a1725cf 100644 --- a/src/lib/merchant_api_get_kyc.c +++ b/src/lib/merchant_api_get_kyc.c @@ -249,7 +249,7 @@ handle_get_kyc_finished (void *cls, static struct TALER_MERCHANT_KycGetHandle * kyc_get (struct GNUNET_CURL_Context *ctx, char *url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const char *exchange_url, struct GNUNET_TIME_Relative timeout, TALER_MERCHANT_KycGetCallback cb, @@ -307,7 +307,7 @@ kyc_get (struct GNUNET_CURL_Context *ctx, struct TALER_MERCHANT_KycGetHandle * TALER_MERCHANT_kyc_get (struct GNUNET_CURL_Context *ctx, const char *backend_url, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const char *exchange_url, struct GNUNET_TIME_Relative timeout, TALER_MERCHANT_KycGetCallback cb, @@ -332,7 +332,7 @@ struct TALER_MERCHANT_KycGetHandle * TALER_MERCHANT_management_kyc_get (struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *instance_id, - const struct TALER_MerchantWireHash *h_wire, + const struct TALER_MerchantWireHashP *h_wire, const char *exchange_url, struct GNUNET_TIME_Relative timeout, TALER_MERCHANT_KycGetCallback cb, diff --git a/src/lib/merchant_api_post_order_abort.c b/src/lib/merchant_api_post_order_abort.c index 20ad98e9..f03d6bcc 100644 --- a/src/lib/merchant_api_post_order_abort.c +++ b/src/lib/merchant_api_post_order_abort.c @@ -45,7 +45,7 @@ struct TALER_MERCHANT_OrderAbortHandle /** * Hash of the contract. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Public key of the merchant. @@ -327,7 +327,7 @@ TALER_MERCHANT_order_abort (struct GNUNET_CURL_Context *ctx, const char *merchant_url, const char *order_id, const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_PrivateContractHash *h_contract, + const struct TALER_PrivateContractHashP *h_contract, unsigned int num_coins, const struct TALER_MERCHANT_AbortCoin coins[], TALER_MERCHANT_AbortCallback cb, diff --git a/src/lib/merchant_api_post_order_claim.c b/src/lib/merchant_api_post_order_claim.c index e144328d..0a70c1b0 100644 --- a/src/lib/merchant_api_post_order_claim.c +++ b/src/lib/merchant_api_post_order_claim.c @@ -88,7 +88,7 @@ handle_post_order_claim_finished (void *cls, struct TALER_MERCHANT_OrderClaimHandle *och = cls; json_t *contract_terms; struct TALER_MerchantSignatureP sig; - struct TALER_PrivateContractHash hash; + struct TALER_PrivateContractHashP hash; const json_t *json = response; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_json ("contract_terms", diff --git a/src/lib/merchant_api_post_order_paid.c b/src/lib/merchant_api_post_order_paid.c index 0ce1fe05..2c398f90 100644 --- a/src/lib/merchant_api_post_order_paid.c +++ b/src/lib/merchant_api_post_order_paid.c @@ -166,7 +166,7 @@ TALER_MERCHANT_order_paid ( const char *merchant_url, const char *order_id, const char *session_id, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_MerchantSignatureP *merchant_sig, TALER_MERCHANT_OrderPaidCallback paid_cb, void *paid_cb_cls) diff --git a/src/lib/merchant_api_post_order_pay.c b/src/lib/merchant_api_post_order_pay.c index 15798797..0cf27e02 100644 --- a/src/lib/merchant_api_post_order_pay.c +++ b/src/lib/merchant_api_post_order_pay.c @@ -82,7 +82,7 @@ struct TALER_MERCHANT_OrderPayHandle * Hash of the contract we are paying, set * if @e am_wallet is true. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Public key of the merchant (instance) being paid, set @@ -120,8 +120,8 @@ check_coin_history (const struct TALER_MERCHANT_PaidCoin *pc, { struct TALER_Amount spent; struct TALER_Amount spent_plus_contrib; - struct TALER_DenominationHash h_denom_pub; - struct TALER_DenominationHash h_denom_pub_pc; + struct TALER_DenominationHashP h_denom_pub; + struct TALER_DenominationHashP h_denom_pub_pc; if (GNUNET_OK != TALER_EXCHANGE_verify_coin_history (NULL, /* do not verify fees */ @@ -443,7 +443,7 @@ TALER_MERCHANT_order_pay_frontend ( json_t *j_coin; const struct TALER_MERCHANT_PaidCoin *pc = &coins[i]; struct TALER_Amount fee; - struct TALER_DenominationHash denom_hash; + struct TALER_DenominationHashP denom_hash; if (0 > TALER_amount_subtract (&fee, @@ -566,24 +566,24 @@ TALER_MERCHANT_order_pay_frontend ( struct TALER_MERCHANT_OrderPayHandle * -TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx, - const char *merchant_url, - const char *session_id, - const struct - TALER_PrivateContractHash *h_contract_terms, - const struct TALER_Amount *amount, - const struct TALER_Amount *max_fee, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_MerchantSignatureP *merchant_sig, - struct GNUNET_TIME_Timestamp timestamp, - struct GNUNET_TIME_Timestamp refund_deadline, - struct GNUNET_TIME_Timestamp pay_deadline, - const struct TALER_MerchantWireHash *h_wire, - const char *order_id, - unsigned int num_coins, - const struct TALER_MERCHANT_PayCoin coins[], - TALER_MERCHANT_OrderPayCallback pay_cb, - void *pay_cb_cls) +TALER_MERCHANT_order_pay ( + struct GNUNET_CURL_Context *ctx, + const char *merchant_url, + const char *session_id, + const struct TALER_PrivateContractHashP *h_contract_terms, + const struct TALER_Amount *amount, + const struct TALER_Amount *max_fee, + const struct TALER_MerchantPublicKeyP *merchant_pub, + const struct TALER_MerchantSignatureP *merchant_sig, + struct GNUNET_TIME_Timestamp timestamp, + struct GNUNET_TIME_Timestamp refund_deadline, + struct GNUNET_TIME_Timestamp pay_deadline, + const struct TALER_MerchantWireHashP *h_wire, + const char *order_id, + unsigned int num_coins, + const struct TALER_MERCHANT_PayCoin coins[], + TALER_MERCHANT_OrderPayCallback pay_cb, + void *pay_cb_cls) { if (GNUNET_YES != TALER_amount_cmp_currency (amount, @@ -601,7 +601,7 @@ TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx, const struct TALER_MERCHANT_PayCoin *coin = &coins[i]; // coin priv. struct TALER_MERCHANT_PaidCoin *p = &pc[i]; // coin pub. struct TALER_Amount fee; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; if (0 > TALER_amount_subtract (&fee, diff --git a/src/lib/merchant_api_post_order_refund.c b/src/lib/merchant_api_post_order_refund.c index a4b5d62a..c59bd762 100644 --- a/src/lib/merchant_api_post_order_refund.c +++ b/src/lib/merchant_api_post_order_refund.c @@ -102,7 +102,7 @@ handle_refund_finished (void *cls, case MHD_HTTP_OK: { const char *taler_refund_uri; - struct TALER_PrivateContractHash h_contract; + struct TALER_PrivateContractHashP h_contract; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_string ("taler_refund_uri", &taler_refund_uri), diff --git a/src/lib/merchant_api_tip_pickup.c b/src/lib/merchant_api_tip_pickup.c index 6d37d922..593efa43 100644 --- a/src/lib/merchant_api_tip_pickup.c +++ b/src/lib/merchant_api_tip_pickup.c @@ -50,7 +50,7 @@ struct PlanchetData /** * Hash of the public key of the coin we are signing. */ - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; /** * Nonce used for @e csr request, if any. diff --git a/src/lib/merchant_api_wallet_get_order.c b/src/lib/merchant_api_wallet_get_order.c index ebe456df..4037ea57 100644 --- a/src/lib/merchant_api_wallet_get_order.c +++ b/src/lib/merchant_api_wallet_get_order.c @@ -220,7 +220,7 @@ TALER_MERCHANT_wallet_order_get ( struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *order_id, - const struct TALER_PrivateContractHash *h_contract, + const struct TALER_PrivateContractHashP *h_contract, struct GNUNET_TIME_Relative timeout, const char *session_id, const struct TALER_Amount *min_refund, diff --git a/src/lib/merchant_api_wallet_post_order_refund.c b/src/lib/merchant_api_wallet_post_order_refund.c index 70af602f..1bc28e2d 100644 --- a/src/lib/merchant_api_wallet_post_order_refund.c +++ b/src/lib/merchant_api_wallet_post_order_refund.c @@ -349,7 +349,7 @@ TALER_MERCHANT_wallet_post_order_refund ( struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *order_id, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, TALER_MERCHANT_WalletRefundCallback cb, void *cb_cls) { diff --git a/src/testing/testing_api_cmd_abort_order.c b/src/testing/testing_api_cmd_abort_order.c index d2e2d357..9c41d53e 100644 --- a/src/testing/testing_api_cmd_abort_order.c +++ b/src/testing/testing_api_cmd_abort_order.c @@ -230,7 +230,7 @@ abort_run (void *cls, const char **coin_reference; const struct TALER_TESTING_Command *proposal_cmd; const char *order_id; - const struct TALER_PrivateContractHash *h_proposal; + const struct TALER_PrivateContractHashP *h_proposal; struct TALER_MerchantPublicKeyP merchant_pub; struct TALER_Amount total_amount; const char *error_name; diff --git a/src/testing/testing_api_cmd_claim_order.c b/src/testing/testing_api_cmd_claim_order.c index b2c8c6c5..d7a3ec41 100644 --- a/src/testing/testing_api_cmd_claim_order.c +++ b/src/testing/testing_api_cmd_claim_order.c @@ -52,7 +52,7 @@ struct OrderClaimState /** * Hash over the contract terms. Only set if we got #MHD_HTTP_OK. */ - struct TALER_PrivateContractHash contract_terms_hash; + struct TALER_PrivateContractHashP contract_terms_hash; /** * Signature of the merchant. Only set if we got #MHD_HTTP_OK. @@ -135,7 +135,7 @@ order_claim_cb (void *cls, const struct TALER_MERCHANT_HttpResponse *hr, const json_t *contract_terms, const struct TALER_MerchantSignatureP *sig, - const struct TALER_PrivateContractHash *hash) + const struct TALER_PrivateContractHashP *hash) { struct OrderClaimState *pls = cls; diff --git a/src/testing/testing_api_cmd_kyc_get.c b/src/testing/testing_api_cmd_kyc_get.c index 07fe84e1..b2912401 100644 --- a/src/testing/testing_api_cmd_kyc_get.c +++ b/src/testing/testing_api_cmd_kyc_get.c @@ -195,7 +195,7 @@ kyc_get_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct KycGetState *cs = cls; - const struct TALER_MerchantWireHash *h_wire = NULL; + const struct TALER_MerchantWireHashP *h_wire = NULL; cs->is = is; if (NULL != cs->h_wire_ref) diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c index 1977f792..85ba174f 100644 --- a/src/testing/testing_api_cmd_merchant_get_order.c +++ b/src/testing/testing_api_cmd_merchant_get_order.c @@ -568,7 +568,7 @@ merchant_get_order_run (void *cls, struct MerchantGetOrderState *gos = cls; const struct TALER_TESTING_Command *order_cmd; const char **order_id; - const struct TALER_PrivateContractHash *h_contract; + const struct TALER_PrivateContractHashP *h_contract; order_cmd = TALER_TESTING_interpreter_lookup_command ( is, diff --git a/src/testing/testing_api_cmd_pay_order.c b/src/testing/testing_api_cmd_pay_order.c index 956a54ef..dbc8d6da 100644 --- a/src/testing/testing_api_cmd_pay_order.c +++ b/src/testing/testing_api_cmd_pay_order.c @@ -38,7 +38,7 @@ struct PayState /** * Contract terms hash code. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * The interpreter state. @@ -261,8 +261,8 @@ pay_run (void *cls, struct GNUNET_TIME_Timestamp pay_deadline; struct GNUNET_TIME_Timestamp timestamp; struct TALER_MerchantPublicKeyP merchant_pub; - struct TALER_MerchantWireHash h_wire; - const struct TALER_PrivateContractHash *h_proposal; + struct TALER_MerchantWireHashP h_wire; + const struct TALER_PrivateContractHashP *h_proposal; struct TALER_Amount total_amount; struct TALER_Amount max_fee; const char *error_name; diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c index bb31dacc..b3f15fc8 100644 --- a/src/testing/testing_api_cmd_post_orders.c +++ b/src/testing/testing_api_cmd_post_orders.c @@ -63,7 +63,7 @@ struct OrdersState /** * Contract terms hash code. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * The /orders operation handle. @@ -191,7 +191,7 @@ orders_claim_cb (void *cls, const struct TALER_MERCHANT_HttpResponse *hr, const json_t *contract_terms, const struct TALER_MerchantSignatureP *sig, - const struct TALER_PrivateContractHash *hash) + const struct TALER_PrivateContractHashP *hash) { struct OrdersState *ps = cls; struct TALER_MerchantPublicKeyP merchant_pub; diff --git a/src/testing/testing_api_cmd_post_orders_paid.c b/src/testing/testing_api_cmd_post_orders_paid.c index 2050478f..6c4e41cd 100644 --- a/src/testing/testing_api_cmd_post_orders_paid.c +++ b/src/testing/testing_api_cmd_post_orders_paid.c @@ -113,7 +113,7 @@ paid_run (void *cls, const char **proposal_reference; const struct TALER_TESTING_Command *proposal_cmd; const char *order_id; - const struct TALER_PrivateContractHash *h_contract_terms; + const struct TALER_PrivateContractHashP *h_contract_terms; const struct TALER_MerchantSignatureP *merchant_sig; ops->is = is; diff --git a/src/testing/testing_api_cmd_refund_order.c b/src/testing/testing_api_cmd_refund_order.c index 15154149..0f94622c 100644 --- a/src/testing/testing_api_cmd_refund_order.c +++ b/src/testing/testing_api_cmd_refund_order.c @@ -85,7 +85,7 @@ static void refund_cb (void *cls, const struct TALER_MERCHANT_HttpResponse *hr, const char *taler_refund_uri, - const struct TALER_PrivateContractHash *h_contract) + const struct TALER_PrivateContractHashP *h_contract) { struct RefundState *ris = cls; diff --git a/src/testing/testing_api_cmd_wallet_get_order.c b/src/testing/testing_api_cmd_wallet_get_order.c index faa0a77d..f9e89d63 100644 --- a/src/testing/testing_api_cmd_wallet_get_order.c +++ b/src/testing/testing_api_cmd_wallet_get_order.c @@ -266,7 +266,7 @@ wallet_get_order_run (void *cls, struct WalletGetOrderState *gos = cls; const struct TALER_TESTING_Command *order_cmd; const char **order_id; - const struct TALER_PrivateContractHash *h_contract; + const struct TALER_PrivateContractHashP *h_contract; order_cmd = TALER_TESTING_interpreter_lookup_command ( is, @@ -640,7 +640,7 @@ wallet_poll_order_start_run (void *cls, struct WalletPollOrderStartState *pos = cls; const struct TALER_TESTING_Command *order_cmd; const char **order_id; - const struct TALER_PrivateContractHash *h_contract; + const struct TALER_PrivateContractHashP *h_contract; order_cmd = TALER_TESTING_interpreter_lookup_command ( is, diff --git a/src/testing/testing_api_cmd_wallet_post_orders_refund.c b/src/testing/testing_api_cmd_wallet_post_orders_refund.c index b138b327..b9e7981f 100644 --- a/src/testing/testing_api_cmd_wallet_post_orders_refund.c +++ b/src/testing/testing_api_cmd_wallet_post_orders_refund.c @@ -173,7 +173,7 @@ obtain_refunds_run (void *cls, const struct TALER_TESTING_Command *proposal_cmd = TALER_TESTING_interpreter_lookup_command (is, wrs->proposal_reference); - const struct TALER_PrivateContractHash *h_contract_terms; + const struct TALER_PrivateContractHashP *h_contract_terms; const char *order_id; if (NULL == proposal_cmd) |