diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-04-27 13:28:28 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-04-27 13:28:28 +0200 |
| commit | 3e8c797bb78dfc0731bfce17e2401d3247ad4d10 (patch) | |
| tree | bc6ca61f2247ec9f6f5d39bfcd3de0852aab77a8 /src/lib | |
| parent | d623cab1a351040cca8729540327f948eb3027aa (diff) | |
| download | exchange-3e8c797bb78dfc0731bfce17e2401d3247ad4d10.tar.gz exchange-3e8c797bb78dfc0731bfce17e2401d3247ad4d10.tar.bz2 exchange-3e8c797bb78dfc0731bfce17e2401d3247ad4d10.zip | |
-get p2p test to pass
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/exchange_api_purse_deposit.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/exchange_api_purse_deposit.c b/src/lib/exchange_api_purse_deposit.c index 540be0e2c..dfe9a6ecf 100644 --- a/src/lib/exchange_api_purse_deposit.c +++ b/src/lib/exchange_api_purse_deposit.c @@ -71,11 +71,6 @@ struct TALER_EXCHANGE_PurseDepositHandle void *cb_cls; /** - * Expected value in the purse after fees. - */ - struct TALER_Amount purse_value_after_fees; - - /** * Public key of the purse. */ struct TALER_PurseContractPublicKeyP purse_pub; @@ -102,8 +97,10 @@ handle_purse_deposit_finished (void *cls, .hr.reply = j, .hr.http_status = (unsigned int) response_code }; + const struct TALER_EXCHANGE_Keys *keys; pch->job = NULL; + keys = TALER_EXCHANGE_get_keys (pch->exchange); switch (response_code) { case 0: @@ -124,7 +121,7 @@ handle_purse_deposit_finished (void *cls, GNUNET_JSON_spec_timestamp ("exchange_timestamp", &etime), TALER_JSON_spec_amount ("total_deposited", - pch->purse_value_after_fees.currency, + keys->currency, &total_deposited), GNUNET_JSON_spec_end () }; @@ -242,6 +239,11 @@ TALER_EXCHANGE_purse_deposit ( char *url; char arg_str[sizeof (pch->purse_pub) * 2 + 32]; + if (0 == num_deposits) + { + GNUNET_break (0); + return NULL; + } GNUNET_assert (GNUNET_YES == TEAH_handle_is_ready (exchange)); pch = GNUNET_new (struct TALER_EXCHANGE_PurseDepositHandle); @@ -301,9 +303,9 @@ TALER_EXCHANGE_purse_deposit ( GNUNET_free (pch); return NULL; } +#endif GNUNET_CRYPTO_eddsa_key_get_public (&deposit->coin_priv.eddsa_priv, &coin_pub.eddsa_pub); -#endif TALER_wallet_purse_deposit_sign ( url, &pch->purse_pub, |