diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-05-01 14:16:47 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-05-01 14:16:47 +0200 |
commit | 49217808de28559964ca3f2b42e50c3990436520 (patch) | |
tree | 0a331cc3cf84cc5540dc4119ef5b442f4a555ee6 /src/backend/taler-merchant-httpd_post-orders-ID-pay.c | |
parent | 577e344b018cf186e179edf8fa56101659e25307 (diff) | |
download | merchant-49217808de28559964ca3f2b42e50c3990436520.tar.gz merchant-49217808de28559964ca3f2b42e50c3990436520.tar.bz2 merchant-49217808de28559964ca3f2b42e50c3990436520.zip |
work on /abort logic
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 | 8 |
1 files changed, 5 insertions, 3 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 f11154e7..46bcaee1 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -896,17 +896,16 @@ find_next_exchange (struct PayContext *pc) * Function called with information about a coin that was deposited. * * @param cls closure - * @param h_contract_terms hashed proposal data + * @param exchange_url exchange where @a coin_pub was deposited * @param coin_pub public key of the coin - * @param exchange_url URL of the exchange that issued @a coin_pub * @param amount_with_fee amount the exchange will deposit for this coin * @param deposit_fee fee the exchange will charge for this coin * @param refund_fee fee the exchange will charge for refunding this coin * @param wire_fee wire fee the exchange of this coin charges - * @param exchange_proof proof from exchange that coin was accepted */ static void check_coin_paid (void *cls, + const char *exchange_url, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *deposit_fee, @@ -924,6 +923,9 @@ check_coin_paid (void *cls, /* Get matching coin from results*/ if ( (0 != GNUNET_memcmp (coin_pub, &dc->coin_pub)) || + (0 != + strcmp (exchange_url, + dc->exchange_url)) || (0 != TALER_amount_cmp (amount_with_fee, &dc->amount_with_fee)) ) continue; /* does not match, skip */ |