taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix misc minor issues in new auditor logic

Browse Source
This commit is contained in:
Christian Grothoff 2017-03-20 00:26:11 +01:00
parent 45d96d8168
commit 7115eda899
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/auditor/taler-auditor.c
View File

@ -1028,7 +1028,7 @@ struct CoinContext
/** /**
* Total outstanding balances across all denomination keys. * Total outstanding balances across all denomination keys.
*/ */
struct TALER_Amount denom_balance; struct TALER_Amount total_denom_balance;
/** /**
* Total deposit fees earned so far. * Total deposit fees earned so far.
@ -1113,7 +1113,7 @@ init_denomination (const struct GNUNET_HashCode *denom_hash,
* @return NULL on error * @return NULL on error
*/ */
static struct DenominationSummary * static struct DenominationSummary *
get_balance_summary (struct CoinContext *cc, get_denomination_summary (struct CoinContext *cc,
const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki, const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki,
const struct GNUNET_HashCode *dh) const struct GNUNET_HashCode *dh)
{ {
@ -1292,7 +1292,7 @@ withdraw_cb (void *cls,
GNUNET_break (0); GNUNET_break (0);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
ds = get_balance_summary (cc, ds = get_denomination_summary (cc,
dki, dki,
&dh); &dh);
TALER_amount_ntoh (&value, TALER_amount_ntoh (&value,
@ -1306,8 +1306,8 @@ withdraw_cb (void *cls,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_amount_add (&cc->denom_balance, TALER_amount_add (&cc->total_denom_balance,
&cc->denom_balance, &cc->total_denom_balance,
&value)) &value))
{ {
GNUNET_break (0); GNUNET_break (0);
@ -1351,6 +1351,7 @@ refresh_session_cb (void *cls,
const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki; const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki;
struct DenominationSummary *dso; struct DenominationSummary *dso;
struct TALER_Amount amount_without_fee; struct TALER_Amount amount_without_fee;
struct TALER_Amount tmp;
if (GNUNET_OK != if (GNUNET_OK !=
get_denomination_info (denom_pub, get_denomination_info (denom_pub,
@ -1480,7 +1481,7 @@ refresh_session_cb (void *cls,
struct DenominationSummary *dsi; struct DenominationSummary *dsi;
struct TALER_Amount value; struct TALER_Amount value;
dsi = get_balance_summary (cc, dsi = get_denomination_summary (cc,
new_dki[i], new_dki[i],
&new_dki[i]->properties.denom_hash); &new_dki[i]->properties.denom_hash);
TALER_amount_ntoh (&value, TALER_amount_ntoh (&value,
@ -1494,8 +1495,8 @@ refresh_session_cb (void *cls,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_amount_add (&cc->denom_balance, TALER_amount_add (&cc->total_denom_balance,
&cc->denom_balance, &cc->total_denom_balance,
&value)) &value))
{ {
GNUNET_break (0); GNUNET_break (0);
@ -1505,17 +1506,18 @@ refresh_session_cb (void *cls,
} }
/* update old coin's denomination balance */ /* update old coin's denomination balance */
dso = get_balance_summary (cc, dso = get_denomination_summary (cc,
dki, dki,
&dki->properties.denom_hash); &dki->properties.denom_hash);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_amount_subtract (&dso->denom_balance, TALER_amount_subtract (&tmp,
&dso->denom_balance, &dso->denom_balance,
amount_with_fee)) amount_with_fee))
{ {
report_emergency (dki); report_emergency (dki);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
dso->denom_balance = tmp;
/* update global up melt fees */ /* update global up melt fees */
{ {
@ -1581,6 +1583,7 @@ deposit_cb (void *cls,
const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki; const struct TALER_EXCHANGEDB_DenominationKeyInformationP *dki;
struct DenominationSummary *ds; struct DenominationSummary *ds;
struct TALER_DepositRequestPS dr; struct TALER_DepositRequestPS dr;
struct TALER_Amount tmp;
if (GNUNET_OK != if (GNUNET_OK !=
get_denomination_info (denom_pub, get_denomination_info (denom_pub,
@ -1622,17 +1625,18 @@ deposit_cb (void *cls,
} }
/* update old coin's denomination balance */ /* update old coin's denomination balance */
ds = get_balance_summary (cc, ds = get_denomination_summary (cc,
dki, dki,
&dki->properties.denom_hash); &dki->properties.denom_hash);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_amount_subtract (&ds->denom_balance, TALER_amount_subtract (&tmp,
&ds->denom_balance, &ds->denom_balance,
amount_with_fee)) amount_with_fee))
{ {
report_emergency (dki); report_emergency (dki);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
ds->denom_balance = tmp;
/* update global up melt fees */ /* update global up melt fees */
{ {
@ -1737,7 +1741,7 @@ refund_cb (void *cls,
} }
/* update coin's denomination balance */ /* update coin's denomination balance */
ds = get_balance_summary (cc, ds = get_denomination_summary (cc,
dki, dki,
&dki->properties.denom_hash); &dki->properties.denom_hash);
if (GNUNET_OK != if (GNUNET_OK !=
@ -1782,7 +1786,7 @@ analyze_coins (void *cls)
dret = adb->get_balance_summary (adb->cls, dret = adb->get_balance_summary (adb->cls,
asession, asession,
&master_pub, &master_pub,
&cc.denom_balance, &cc.total_denom_balance,
&cc.deposit_fee_balance, &cc.deposit_fee_balance,
&cc.melt_fee_balance, &cc.melt_fee_balance,
&cc.refund_fee_balance, &cc.refund_fee_balance,
@ -1796,7 +1800,7 @@ analyze_coins (void *cls)
{ {
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_amount_get_zero (currency, TALER_amount_get_zero (currency,
&cc.denom_balance)); &cc.total_denom_balance));
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_amount_get_zero (currency, TALER_amount_get_zero (currency,
&cc.deposit_fee_balance)); &cc.deposit_fee_balance));
@ -1869,7 +1873,7 @@ analyze_coins (void *cls)
dret = adb->update_balance_summary (adb->cls, dret = adb->update_balance_summary (adb->cls,
asession, asession,
&master_pub, &master_pub,
&cc.denom_balance, &cc.total_denom_balance,
&cc.deposit_fee_balance, &cc.deposit_fee_balance,
&cc.melt_fee_balance, &cc.melt_fee_balance,
&cc.refund_fee_balance, &cc.refund_fee_balance,
@ -1878,7 +1882,7 @@ analyze_coins (void *cls)
dret = adb->insert_balance_summary (adb->cls, dret = adb->insert_balance_summary (adb->cls,
asession, asession,
&master_pub, &master_pub,
&cc.denom_balance, &cc.total_denom_balance,
&cc.deposit_fee_balance, &cc.deposit_fee_balance,
&cc.melt_fee_balance, &cc.melt_fee_balance,
&cc.refund_fee_balance, &cc.refund_fee_balance,
@ -2469,7 +2473,7 @@ check_wire_out_cb (void *cls,
"could not load required wire plugin to validate"); "could not load required wire plugin to validate");
return; return;
} }
if (GNUNET_OK != if (GNUNET_SYSERR ==
plugin->amount_round (plugin->cls, plugin->amount_round (plugin->cls,
&wcc.total_deposits)) &wcc.total_deposits))
{ {