summaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-16 22:40:12 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-16 22:40:12 +0100
commit0305cf5f9eb904e7a3ab3e8d39f4974a92a9a0b3 (patch)
tree8a5d839bb3cfb5e96b430ff6d1eeeed653cc4a6b /src/exchange
parent0a415262daa93c96a9305df11a6573b49976a8cc (diff)
downloadexchange-0305cf5f9eb904e7a3ab3e8d39f4974a92a9a0b3.tar.gz
exchange-0305cf5f9eb904e7a3ab3e8d39f4974a92a9a0b3.tar.bz2
exchange-0305cf5f9eb904e7a3ab3e8d39f4974a92a9a0b3.zip
move function to libtalerexchangedb, as planned
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-aggregator.c2
-rw-r--r--src/exchange/taler-exchange-httpd_db.c119
-rw-r--r--src/exchange/taler-exchange-httpd_db.h18
-rw-r--r--src/exchange/taler-exchange-httpd_deposit.c6
-rw-r--r--src/exchange/taler-exchange-httpd_payback.c6
-rw-r--r--src/exchange/taler-exchange-httpd_refresh_melt.c6
6 files changed, 10 insertions, 147 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index 37ac5336..264cbf62 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -1835,7 +1835,7 @@ run_transfers (void *cls)
if (GNUNET_OK !=
db_plugin->start (db_plugin->cls,
session,
- "aggregator run transfer"))
+ "aggregator run transfer"))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to start database transaction!\n");
diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c
index be7a0300..bc6f1ca6 100644
--- a/src/exchange/taler-exchange-httpd_db.c
+++ b/src/exchange/taler-exchange-httpd_db.c
@@ -165,123 +165,4 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
}
-/**
- * Calculate the total value of all transactions performed.
- * Stores @a off plus the cost of all transactions in @a tl
- * in @a ret.
- *
- * @param tl transaction list to process
- * @param off offset to use as the starting value
- * @param[out] ret where the resulting total is to be stored
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
- */
-// FIXME: maybe move to another module, i.e. exchangedb???
-int
-TEH_DB_calculate_transaction_list_totals (struct
- TALER_EXCHANGEDB_TransactionList *tl,
- const struct TALER_Amount *off,
- struct TALER_Amount *ret)
-{
- struct TALER_Amount spent = *off;
- struct TALER_Amount refunded;
-
- GNUNET_assert (GNUNET_OK ==
- TALER_amount_get_zero (spent.currency,
- &refunded));
- for (struct TALER_EXCHANGEDB_TransactionList *pos = tl; NULL != pos; pos =
- pos->next)
- {
- switch (pos->type)
- {
- case TALER_EXCHANGEDB_TT_DEPOSIT:
- /* spent += pos->amount_with_fee */
- if (GNUNET_OK !=
- TALER_amount_add (&spent,
- &spent,
- &pos->details.deposit->amount_with_fee))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- case TALER_EXCHANGEDB_TT_REFRESH_MELT:
- /* spent += pos->amount_with_fee */
- if (GNUNET_OK !=
- TALER_amount_add (&spent,
- &spent,
- &pos->details.melt->session.amount_with_fee))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- case TALER_EXCHANGEDB_TT_REFUND:
- /* refunded += pos->refund_amount - pos->refund_fee */
- if (GNUNET_OK !=
- TALER_amount_add (&refunded,
- &refunded,
- &pos->details.refund->refund_amount))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- if (GNUNET_OK !=
- TALER_amount_subtract (&refunded,
- &refunded,
- &pos->details.refund->refund_fee))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- case TALER_EXCHANGEDB_TT_OLD_COIN_PAYBACK:
- /* refunded += pos->value */
- if (GNUNET_OK !=
- TALER_amount_add (&refunded,
- &refunded,
- &pos->details.old_coin_payback->value))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- case TALER_EXCHANGEDB_TT_PAYBACK:
- /* spent += pos->value */
- if (GNUNET_OK !=
- TALER_amount_add (&spent,
- &spent,
- &pos->details.payback->value))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- case TALER_EXCHANGEDB_TT_PAYBACK_REFRESH:
- /* spent += pos->value */
- if (GNUNET_OK !=
- TALER_amount_add (&spent,
- &spent,
- &pos->details.payback_refresh->value))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- }
- }
- /* spent = spent - refunded */
- if (GNUNET_SYSERR ==
- TALER_amount_subtract (&spent,
- &spent,
- &refunded))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
-
- *ret = spent;
- return GNUNET_OK;
-}
-
-
/* end of taler-exchange-httpd_db.c */
diff --git a/src/exchange/taler-exchange-httpd_db.h b/src/exchange/taler-exchange-httpd_db.h
index c63b3668..e6d38d7f 100644
--- a/src/exchange/taler-exchange-httpd_db.h
+++ b/src/exchange/taler-exchange-httpd_db.h
@@ -107,23 +107,5 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
void *cb_cls);
-/**
- * Calculate the total value of all transactions performed.
- * Stores @a off plus the cost of all transactions in @a tl
- * in @a ret.
- *
- * @param tl transaction list to process
- * @param off offset to use as the starting value
- * @param[out] ret where the resulting total is to be stored
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
- */
-// FIXME: maybe move to another module, i.e. exchangedb???
-int
-TEH_DB_calculate_transaction_list_totals (struct
- TALER_EXCHANGEDB_TransactionList *tl,
- const struct TALER_Amount *off,
- struct TALER_Amount *ret);
-
-
#endif
/* TALER_EXCHANGE_HTTPD_DB_H */
diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c
index 48504778..11f579ab 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -193,9 +193,9 @@ deposit_transaction (void *cls,
if (0 > qs)
return qs;
if (GNUNET_OK !=
- TEH_DB_calculate_transaction_list_totals (tl,
- &spent,
- &spent))
+ TALER_EXCHANGEDB_calculate_transaction_list_totals (tl,
+ &spent,
+ &spent))
{
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
tl);
diff --git a/src/exchange/taler-exchange-httpd_payback.c b/src/exchange/taler-exchange-httpd_payback.c
index b7fe593d..a05045b2 100644
--- a/src/exchange/taler-exchange-httpd_payback.c
+++ b/src/exchange/taler-exchange-httpd_payback.c
@@ -312,9 +312,9 @@ payback_transaction (void *cls,
TALER_amount_get_zero (pc->value.currency,
&spent));
if (GNUNET_OK !=
- TEH_DB_calculate_transaction_list_totals (tl,
- &spent,
- &spent))
+ TALER_EXCHANGEDB_calculate_transaction_list_totals (tl,
+ &spent,
+ &spent))
{
GNUNET_break (0);
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
diff --git a/src/exchange/taler-exchange-httpd_refresh_melt.c b/src/exchange/taler-exchange-httpd_refresh_melt.c
index 8fbb5851..4f429012 100644
--- a/src/exchange/taler-exchange-httpd_refresh_melt.c
+++ b/src/exchange/taler-exchange-httpd_refresh_melt.c
@@ -225,9 +225,9 @@ refresh_check_melt (struct MHD_Connection *connection,
}
}
if (GNUNET_OK !=
- TEH_DB_calculate_transaction_list_totals (tl,
- &spent,
- &spent))
+ TALER_EXCHANGEDB_calculate_transaction_list_totals (tl,
+ &spent,
+ &spent))
{
GNUNET_break (0);
TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,