From fbbf35c87ff71b6dc1e29718c591ea47f2c5eb1e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 25 Apr 2016 00:26:34 +0200 Subject: fix #4438 --- src/exchangedb/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am index 0c6a7313..83be82a2 100644 --- a/src/exchangedb/Makefile.am +++ b/src/exchangedb/Makefile.am @@ -14,7 +14,9 @@ pkgcfg_DATA = \ EXTRA_DIST = \ exchangedb.conf \ - exchangedb-postgres.conf + exchangedb-postgres.conf \ + plugin_exchangedb_common.c \ + test-exchange-db-postgres.conf plugindir = $(libdir)/taler @@ -24,10 +26,6 @@ plugin_LTLIBRARIES = \ libtaler_plugin_exchangedb_postgres.la endif -EXTRA_DIST = \ - plugin_exchangedb_common.c \ - test-exchange-db-postgres.conf - libtaler_plugin_exchangedb_postgres_la_SOURCES = \ plugin_exchangedb_postgres.c libtaler_plugin_exchangedb_postgres_la_LIBADD = \ -- cgit v1.2.3 From 47c3a489e2dd89e0e9054f5e1735e549e7e2c83e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 25 Apr 2016 00:31:23 +0200 Subject: presumably fixing #4455. A check did exist (see taler-exchange-httpd_deposit.c:225), but the two checks disagreed whether it was OK for the fee to be exactly equal to the amount. Now both checks allow the fee to be equal to the amount. --- src/exchange/taler-exchange-httpd_db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c index 1e392c58..4b6b458c 100644 --- a/src/exchange/taler-exchange-httpd_db.c +++ b/src/exchange/taler-exchange-httpd_db.c @@ -246,7 +246,7 @@ TMH_DB_execute_deposit (struct MHD_Connection *connection, } COMMIT_TRANSACTION(session, connection); - GNUNET_assert (GNUNET_OK == + GNUNET_assert (GNUNET_SYSERR != TALER_amount_subtract (&amount_without_fee, &deposit->amount_with_fee, &deposit->deposit_fee)); -- cgit v1.2.3