diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-02-07 15:09:10 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-02-07 15:09:10 +0100 |
| commit | 92246c3e8841978cb8f495c3e2da3deca19d7391 (patch) | |
| tree | cda2fb5623f6b544c3f6eb2005c48c0228b551f6 /src/exchange-lib/exchange_api_refund.c | |
| parent | 8c820b6916841d746475a4f67904272a518a7aa9 (diff) | |
remove transaction_id, only one payment per proposal allowed
Diffstat (limited to 'src/exchange-lib/exchange_api_refund.c')
| -rw-r--r-- | src/exchange-lib/exchange_api_refund.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/exchange-lib/exchange_api_refund.c b/src/exchange-lib/exchange_api_refund.c index 3f08e1597..4a0cac5b5 100644 --- a/src/exchange-lib/exchange_api_refund.c +++ b/src/exchange-lib/exchange_api_refund.c @@ -221,7 +221,6 @@ handle_refund_finished (void *cls, * (with deposit fee) of the original deposit contribution of this coin * @param refund_fee fee applicable to this coin for the refund * @param h_proposal_data hash of the contact of the merchant with the customer that is being refunded - * @param transaction_id transaction id for the transaction being refunded, must match @a h_proposal_data * @param coin_pub coin’s public key of the coin from the original deposit operation * @param rtransaction_id transaction id for the transaction between merchant and customer (of refunding operation); * this is needed as we may first do a partial refund and later a full refund. If both @@ -238,7 +237,6 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, const struct TALER_Amount *amount, const struct TALER_Amount *refund_fee, const struct GNUNET_HashCode *h_proposal_data, - uint64_t transaction_id, const struct TALER_CoinSpendPublicKeyP *coin_pub, uint64_t rtransaction_id, const struct TALER_MerchantPrivateKeyP *merchant_priv, @@ -257,7 +255,6 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, rr.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_REFUND); rr.purpose.size = htonl (sizeof (struct TALER_RefundRequestPS)); rr.h_proposal_data = *h_proposal_data; - rr.transaction_id = GNUNET_htonll (transaction_id); rr.coin_pub = *coin_pub; GNUNET_CRYPTO_eddsa_key_get_public (&merchant_priv->eddsa_priv, &rr.merchant.eddsa_pub); @@ -272,13 +269,12 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, &merchant_sig.eddsa_sig)); refund_obj = json_pack ("{s:o, s:o," /* amount/fee */ " s:o, s:o," /* h_proposal_data, coin_pub */ - " s:I, s:I," /* transaction id, rtransaction id */ + " s:I," /* rtransaction id */ " s:o, s:o}", /* merchant_pub, merchant_sig */ "refund_amount", TALER_JSON_from_amount (amount), "refund_fee", TALER_JSON_from_amount (refund_fee), "h_proposal_data", GNUNET_JSON_from_data_auto (h_proposal_data), "coin_pub", GNUNET_JSON_from_data_auto (coin_pub), - "transaction_id", (json_int_t) transaction_id, "rtransaction_id", (json_int_t) rtransaction_id, "merchant_pub", GNUNET_JSON_from_data_auto (&rr.merchant), "merchant_sig", GNUNET_JSON_from_data_auto (&merchant_sig) @@ -293,7 +289,6 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, rh->depconf.purpose.size = htonl (sizeof (struct TALER_RefundConfirmationPS)); rh->depconf.purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND); rh->depconf.h_proposal_data = *h_proposal_data; - rh->depconf.transaction_id = GNUNET_htonll (transaction_id); rh->depconf.coin_pub = *coin_pub; rh->depconf.merchant = rr.merchant; rh->depconf.rtransaction_id = GNUNET_htonll (rtransaction_id); |