diff options
Diffstat (limited to 'src/auditor')
| -rw-r--r-- | src/auditor/taler-helper-auditor-aggregation.c | 21 | ||||
| -rw-r--r-- | src/auditor/taler-helper-auditor-reserves.c | 6 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c index 33c51731d..da10ae760 100644 --- a/src/auditor/taler-helper-auditor-aggregation.c +++ b/src/auditor/taler-helper-auditor-aggregation.c @@ -305,14 +305,9 @@ struct WireFeeInfo struct GNUNET_TIME_Timestamp end_date; /** - * How high is the wire fee. + * How high are the wire fees. */ - struct TALER_Amount wire_fee; - - /** - * How high is the closing fee. - */ - struct TALER_Amount closing_fee; + struct TALER_WireFeeSet fees; }; @@ -911,7 +906,7 @@ get_wire_fee (struct AggregationContext *ac, GNUNET_TIME_timestamp_cmp (pos->end_date, >, timestamp) ) - return &pos->wire_fee; + return &pos->fees.wire; if (GNUNET_TIME_timestamp_cmp (pos->start_date, >, timestamp)) @@ -926,8 +921,7 @@ get_wire_fee (struct AggregationContext *ac, timestamp, &wfi->start_date, &wfi->end_date, - &wfi->wire_fee, - &wfi->closing_fee, + &wfi->fees, &master_sig)) { GNUNET_break (0); @@ -944,8 +938,7 @@ get_wire_fee (struct AggregationContext *ac, method, wfi->start_date, wfi->end_date, - &wfi->wire_fee, - &wfi->closing_fee, + &wfi->fees, &TALER_ARL_master_pub, &master_sig)) { @@ -958,7 +951,7 @@ get_wire_fee (struct AggregationContext *ac, /* Established fee, keep in sorted list */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Wire fee is %s starting at %s\n", - TALER_amount2s (&wfi->wire_fee), + TALER_amount2s (&wfi->fees.wire), GNUNET_TIME_timestamp2s (wfi->start_date)); if ( (NULL == pos) || (NULL == pos->prev) ) @@ -999,7 +992,7 @@ get_wire_fee (struct AggregationContext *ac, TALER_JSON_pack_time_abs_human ("time", wfi->end_date.abs_time))); } - return &wfi->wire_fee; + return &wfi->fees.wire; } diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c index f14a39995..f34f0c467 100644 --- a/src/auditor/taler-helper-auditor-reserves.c +++ b/src/auditor/taler-helper-auditor-reserves.c @@ -862,7 +862,7 @@ get_closing_fee (const char *receiver_account, struct TALER_MasterSignatureP master_sig; struct GNUNET_TIME_Timestamp start_date; struct GNUNET_TIME_Timestamp end_date; - struct TALER_Amount wire_fee; + struct TALER_WireFeeSet fees; char *method; method = TALER_payto_get_method (receiver_account); @@ -875,8 +875,7 @@ get_closing_fee (const char *receiver_account, atime, &start_date, &end_date, - &wire_fee, - fee, + &fees, &master_sig)) { char *diag; @@ -892,6 +891,7 @@ get_closing_fee (const char *receiver_account, GNUNET_free (method); return GNUNET_SYSERR; } + *fee = fees.closing; GNUNET_free (method); return GNUNET_OK; } |