From e2f67e7bf9c3779720b9a61012a4d0c0c4b6e1d1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 26 Aug 2021 22:23:32 +0200 Subject: use camount --- src/authorization/anastasis_authorization_plugin_iban.c | 4 ++-- src/reducer/anastasis_api_backup_redux.c | 4 ++++ src/reducer/anastasis_api_recovery_redux.c | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/authorization/anastasis_authorization_plugin_iban.c b/src/authorization/anastasis_authorization_plugin_iban.c index 50fff8d..e70bfdd 100644 --- a/src/authorization/anastasis_authorization_plugin_iban.c +++ b/src/authorization/anastasis_authorization_plugin_iban.c @@ -425,11 +425,11 @@ check_payment_ok (void *cls, ctx->expected_amount.currency); if (1 == TALER_amount_cmp (&ctx->expected_amount, - amount)) + &camount)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Amount `%s' insufficient for authorization\n", - TALER_amount2s (amount)); + TALER_amount2s (&camount)); return false; } return (code == as->code); diff --git a/src/reducer/anastasis_api_backup_redux.c b/src/reducer/anastasis_api_backup_redux.c index d0268c9..27a79c0 100644 --- a/src/reducer/anastasis_api_backup_redux.c +++ b/src/reducer/anastasis_api_backup_redux.c @@ -869,6 +869,7 @@ eval_provider_selection (struct PolicyBuilder *pb, }; policy_ent[i].provider_name = prov_sel[i]; + policy_ent[i].usage_fee = NULL; if (GNUNET_OK != GNUNET_JSON_parse (method_obj, mspec, @@ -984,7 +985,10 @@ eval_provider_selection (struct PolicyBuilder *pb, pb->current_policy->pm_tail, m); for (unsigned int i = 0; ireq_methods; i++) + { free_costs (m->providers[i].usage_fee); + m->providers[i].usage_fee = NULL; + } GNUNET_free (m->providers); GNUNET_free (m); } diff --git a/src/reducer/anastasis_api_recovery_redux.c b/src/reducer/anastasis_api_recovery_redux.c index ee6d0d8..864ded2 100644 --- a/src/reducer/anastasis_api_recovery_redux.c +++ b/src/reducer/anastasis_api_recovery_redux.c @@ -683,7 +683,7 @@ answer_feedback_cb ( set_state (sctx->state, ANASTASIS_RECOVERY_STATE_CHALLENGE_SELECTING); sctx->cb (sctx->cb_cls, - TALER_EC_NONE, + csr->details.server_failure.ec, sctx->state); sctx_free (sctx); return; @@ -704,7 +704,7 @@ answer_feedback_cb ( set_state (sctx->state, ANASTASIS_RECOVERY_STATE_CHALLENGE_SELECTING); sctx->cb (sctx->cb_cls, - TALER_EC_NONE, + TALER_EC_ANASTASIS_TRUTH_UNKNOWN, sctx->state); sctx_free (sctx); return; @@ -726,7 +726,7 @@ answer_feedback_cb ( set_state (sctx->state, ANASTASIS_RECOVERY_STATE_CHALLENGE_SELECTING); sctx->cb (sctx->cb_cls, - TALER_EC_NONE, + TALER_EC_ANASTASIS_TRUTH_RATE_LIMITED, sctx->state); sctx_free (sctx); return; @@ -748,7 +748,7 @@ answer_feedback_cb ( set_state (sctx->state, ANASTASIS_RECOVERY_STATE_CHALLENGE_SELECTING); sctx->cb (sctx->cb_cls, - TALER_EC_NONE, + TALER_EC_ANASTASIS_TRUTH_AUTH_TIMEOUT, sctx->state); sctx_free (sctx); return; -- cgit v1.2.3