diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_post-orders-ID-pay.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 23 |
1 files changed, 10 insertions, 13 deletions
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 fa372fe0..04d174eb 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -76,7 +76,7 @@ struct DepositConfirmation /** * Hash of the denomination of this coin. */ - struct GNUNET_HashCode h_denom; + struct TALER_DenominationHash h_denom; /** * Amount this coin contributes to the total purchase price. @@ -218,13 +218,13 @@ struct PayContext /** * Hashed proposal. */ - struct GNUNET_HashCode h_contract_terms; + struct TALER_PrivateContractHash h_contract_terms; /** * "h_wire" from @e contract_terms. Used to identify * the instance's wire transfer method. */ - struct GNUNET_HashCode h_wire; + struct TALER_MerchantWireHash h_wire; /** * Maximum fee the merchant is willing to pay, from @e root. @@ -511,11 +511,7 @@ pay_context_cleanup (void *cls) { struct DepositConfirmation *dc = &pc->dc[i]; - if (NULL != dc->ub_sig.rsa_signature) - { - GNUNET_CRYPTO_rsa_signature_free (dc->ub_sig.rsa_signature); - dc->ub_sig.rsa_signature = NULL; - } + TALER_denom_sig_free (&dc->ub_sig); GNUNET_free (dc->exchange_url); } GNUNET_free (pc->dc); @@ -590,7 +586,7 @@ deposit_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Storing successful payment %s (%s) at instance `%s'\n", pc->hc->infix, - GNUNET_h2s (&pc->h_contract_terms), + GNUNET_h2s (&pc->h_contract_terms.hash), pc->hc->instance->settings.id); TMH_db->preflight (TMH_db->cls); { @@ -846,6 +842,7 @@ process_pay_with_exchange (void *cls, pc->wire_transfer_deadline, pc->wm->j_wire, &pc->h_contract_terms, + NULL, /* FIXME-Oec */ &dc->coin_pub, &dc->ub_sig, &denom_details->key, @@ -1471,7 +1468,7 @@ execute_pay_transaction (struct PayContext *pc) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Order `%s' (%s) was fully paid\n", pc->order_id, - GNUNET_h2s (&pc->h_contract_terms)); + GNUNET_h2s (&pc->h_contract_terms.hash)); { enum GNUNET_DB_QueryStatus qs; @@ -1645,8 +1642,8 @@ parse_pay (struct MHD_Connection *connection, &dc->coin_sig), GNUNET_JSON_spec_fixed_auto ("coin_pub", &dc->coin_pub), - TALER_JSON_spec_denomination_signature ("ub_sig", - &dc->ub_sig), + TALER_JSON_spec_denom_sig ("ub_sig", + &dc->ub_sig), GNUNET_JSON_spec_fixed_auto ("h_denom", &dc->h_denom), TALER_JSON_spec_amount ("contribution", @@ -1758,7 +1755,7 @@ parse_pay (struct MHD_Connection *connection, GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Handling payment for order `%s' with contract hash `%s'\n", pc->order_id, - GNUNET_h2s (&pc->h_contract_terms)); + GNUNET_h2s (&pc->h_contract_terms.hash)); /* basic sanity check on the contract */ if (NULL == json_object_get (contract_terms, |