diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_post-tips-ID-pickup.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-tips-ID-pickup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c b/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c index c60ba021..03b232d4 100644 --- a/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c +++ b/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c @@ -144,13 +144,13 @@ struct PickupContext /** * Which tip is being picked up? */ - struct GNUNET_HashCode tip_id; + struct TALER_TipIdentifierP tip_id; /** * What is the ID of the pickup operation? (Basically a * hash over the key inputs). */ - struct GNUNET_HashCode pickup_id; + struct TALER_PickupIdentifierP pickup_id; /** * Array of our planchets. @@ -636,7 +636,7 @@ TMH_post_tips_ID_pickup (const struct TMH_RequestHandler *rh, GNUNET_assert (NULL != hc->infix); if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (hc->infix, - &pc->tip_id)) + &pc->tip_id.hash)) { /* tip_id has wrong encoding */ GNUNET_break_op (0); @@ -722,7 +722,7 @@ TMH_post_tips_ID_pickup (const struct TMH_RequestHandler *rh, pd->coin_ev_size); } GNUNET_CRYPTO_hash_context_finish (hc, - &pc->pickup_id); + &pc->pickup_id.hash); } } @@ -804,7 +804,7 @@ RETRY: sigs); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Lookup pickup `%s' resulted in %d\n", - GNUNET_h2s (&pc->pickup_id), + GNUNET_h2s (&pc->pickup_id.hash), qs); if (qs > GNUNET_DB_STATUS_SUCCESS_ONE_RESULT) qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; @@ -830,7 +830,7 @@ RETRY: } GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Lookup pickup `%s' initiated withdraw #%u\n", - GNUNET_h2s (&pc->pickup_id), + GNUNET_h2s (&pc->pickup_id.hash), i); try_withdraw (pc, exchange_url, |