[taler-exchange] branch master updated (c75157e8 -> ca55b507)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository exchange.

    from c75157e8 fix test_exchange_api_twisted FTBFS
     new 1788ca2b reorganization of file structure
     new ca55b507 restructure tests and build system

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/bank-lib/Makefile.am                           |  88 +-------
 src/exchange/Makefile.am                           |  49 +---
 src/lib/Makefile.am                                | 249 +++++++++++++--------
 src/{bank-lib => lib}/bank.conf                    |   0
 src/{bank-lib => lib}/bank_twisted.conf            |   0
 .../test-taler-exchange-aggregator-postgres.conf   |   0
 .../test-taler-exchange-wirewatch-postgres.conf    |   0
 src/{bank-lib => lib}/test_bank_api_twisted.c      |   0
 .../test_taler_exchange_aggregator.c               |   0
 .../test_taler_exchange_wirewatch.c                |   0
 ...testing_api_cmd_auditor_deposit_confirmation.c} |   0
 ...anges.c => testing_api_cmd_auditor_exchanges.c} |   0
 ...or.c => testing_api_cmd_auditor_exec_auditor.c} |   0
 ... testing_api_cmd_auditor_exec_auditor_dbinit.c} |   0
 ...=> testing_api_cmd_auditor_exec_wire_auditor.c} |   0
 .../testing_api_cmd_bank_admin_add_incoming.c}     |   0
 .../testing_api_cmd_bank_history_credit.c}         |   0
 .../testing_api_cmd_bank_history_debit.c}          |   0
 .../testing_api_cmd_bank_transfer.c}               |   0
 ...api_helpers.c => testing_api_helpers_auditor.c} |   0
 .../testing_api_helpers_bank.c}                    |   0
 ...pi_helpers.c => testing_api_helpers_exchange.c} |   0
 22 files changed, 166 insertions(+), 220 deletions(-)
 rename src/{bank-lib => lib}/bank.conf (100%)
 rename src/{bank-lib => lib}/bank_twisted.conf (100%)
 rename src/{exchange => lib}/test-taler-exchange-aggregator-postgres.conf 
(100%)
 rename src/{exchange => lib}/test-taler-exchange-wirewatch-postgres.conf (100%)
 rename src/{bank-lib => lib}/test_bank_api_twisted.c (100%)
 rename src/{exchange => lib}/test_taler_exchange_aggregator.c (100%)
 rename src/{exchange => lib}/test_taler_exchange_wirewatch.c (100%)
 rename src/lib/{testing_auditor_api_cmd_deposit_confirmation.c => 
testing_api_cmd_auditor_deposit_confirmation.c} (100%)
 rename src/lib/{testing_auditor_api_cmd_exchanges.c => 
testing_api_cmd_auditor_exchanges.c} (100%)
 rename src/lib/{testing_auditor_api_cmd_exec_auditor.c => 
testing_api_cmd_auditor_exec_auditor.c} (100%)
 rename src/lib/{testing_auditor_api_cmd_exec_auditor_dbinit.c => 
testing_api_cmd_auditor_exec_auditor_dbinit.c} (100%)
 rename src/lib/{testing_auditor_api_cmd_exec_wire_auditor.c => 
testing_api_cmd_auditor_exec_wire_auditor.c} (100%)
 rename src/{bank-lib/testing_api_cmd_admin_add_incoming.c => 
lib/testing_api_cmd_bank_admin_add_incoming.c} (100%)
 rename src/{bank-lib/testing_api_cmd_history_credit.c => 
lib/testing_api_cmd_bank_history_credit.c} (100%)
 rename src/{bank-lib/testing_api_cmd_history_debit.c => 
lib/testing_api_cmd_bank_history_debit.c} (100%)
 rename src/{bank-lib/testing_api_cmd_transfer.c => 
lib/testing_api_cmd_bank_transfer.c} (100%)
 rename src/lib/{testing_auditor_api_helpers.c => 
testing_api_helpers_auditor.c} (100%)
 rename src/{bank-lib/testing_api_helpers.c => lib/testing_api_helpers_bank.c} 
(100%)
 rename src/lib/{testing_api_helpers.c => testing_api_helpers_exchange.c} (100%)

diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index 76c85eac..35af7826 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -30,8 +30,7 @@ taler_bank_transfer_LDADD = \
 
 lib_LTLIBRARIES = \
   libtalerbank.la \
-  libtalerfakebank.la \
-  libtalerbanktesting.la
+  libtalerfakebank.la
 
 libtalerbank_la_LDFLAGS = \
   -version-info 1:0:0 \
@@ -66,24 +65,6 @@ libtalerfakebank_la_LIBADD = \
   -lmicrohttpd \
   $(XLIB)
 
-libtalerbanktesting_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-libtalerbanktesting_la_SOURCES = \
-  testing_api_cmd_admin_add_incoming.c \
-  testing_api_cmd_history_credit.c \
-  testing_api_cmd_history_debit.c \
-  testing_api_cmd_transfer.c \
-  testing_api_helpers.c
-libtalerbanktesting_la_LIBADD = \
-  libtalerbank.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  -lmicrohttpd \
-  $(XLIB)
-
 if HAVE_LIBCURL
 libtalerbank_la_LIBADD += -lcurl
 else
@@ -91,70 +72,3 @@ if HAVE_LIBGNURL
 libtalerbank_la_LIBADD += -lgnurl
 endif
 endif
-
-check_PROGRAMS = \
-  test_bank_api_with_fakebank \
-  test_bank_api_with_pybank
-
-if HAVE_TWISTER
-check_PROGRAMS += \
-  test_bank_api_with_pybank_twisted \
-  test_bank_api_with_fakebank_twisted
-
-
-test_bank_api_with_pybank_twisted_SOURCES = \
-  test_bank_api_twisted.c
-test_bank_api_with_pybank_twisted_LDADD = \
-  $(top_builddir)/src/lib/libtalertesting.la \
-  libtalerbank.la \
-  libtalerbanktesting.la \
-  libtalerfakebank.la \
-  $(top_builddir)/src/lib/libtalerexchange.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  -ltalertwistertesting \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson
-
-
-test_bank_api_with_fakebank_twisted_SOURCES = \
-  test_bank_api_twisted.c
-test_bank_api_with_fakebank_twisted_LDADD = \
-  $(top_builddir)/src/lib/libtalertesting.la \
-  libtalerbank.la \
-  libtalerbanktesting.la \
-  libtalerfakebank.la \
-  $(top_builddir)/src/lib/libtalerexchange.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  -ltalertwistertesting \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson
-endif
-
-TESTS = \
-  $(check_PROGRAMS)
-
-test_bank_api_with_pybank_SOURCES = \
-  test_bank_api.c
-test_bank_api_with_pybank_LDADD = \
-  $(top_builddir)/src/lib/libtalertesting.la \
-  libtalerbanktesting.la \
-  -ltalerexchange \
-  -lgnunetutil \
-  libtalerbank.la
-
-test_bank_api_with_fakebank_SOURCES = \
-  test_bank_api.c
-test_bank_api_with_fakebank_LDADD = \
-  $(top_builddir)/src/lib/libtalertesting.la \
-  libtalerbanktesting.la \
-  -ltalerexchange \
-  -lgnunetutil \
-  libtalerbank.la
-
-EXTRA_DIST = \
-  bank.conf \
-  bank_twisted.conf
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index b08c85c6..92bbb90d 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -15,6 +15,8 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
 pkgcfg_DATA = \
   exchange.conf
 
+# Programs
+
 bin_PROGRAMS = \
   taler-exchange-aggregator \
   taler-exchange-httpd \
@@ -88,57 +90,24 @@ taler_exchange_httpd_SOURCES += \
   taler-exchange-httpd_test.c taler-exchange-httpd_test.h
 endif
 
+
+# Testcases
+
+AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export 
PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
+
 check_SCRIPTS = \
   test_taler_exchange_httpd.sh
-
 if HAVE_EXPENSIVE_TESTS
 check_SCRIPTS += \
   test_taler_exchange_httpd_afl.sh
 endif
 
-test_taler_exchange_aggregator_postgres_SOURCES = \
-  test_taler_exchange_aggregator.c
-test_taler_exchange_aggregator_postgres_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lmicrohttpd \
-  -lgnunetutil \
-  -lgnunetjson \
-  -ljansson \
-  -lpthread
-
-test_taler_exchange_wirewatch_postgres_SOURCES = \
-  test_taler_exchange_wirewatch.c
-test_taler_exchange_wirewatch_postgres_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lmicrohttpd \
-  -lgnunetutil \
-  -lgnunetjson \
-  -lgnunetpq \
-  -ljansson \
-  -lpthread
-
-check_PROGRAMS = \
-  test_taler_exchange_aggregator-postgres \
-  test_taler_exchange_wirewatch-postgres
-
-AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export 
PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
-
 TESTS = \
-  $(check_SCRIPTS) \
-  $(check_PROGRAMS)
+  $(check_SCRIPTS)
 
+# Distribution
 
 EXTRA_DIST = \
-  test-taler-exchange-aggregator-postgres.conf \
-  test-taler-exchange-wirewatch-postgres.conf \
   
test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv
 \
   test_taler_exchange_httpd.conf \
   exchange.conf \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d4650660..8ffee92b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,11 +6,12 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+# Libraries
+
 lib_LTLIBRARIES = \
   libtalerauditor.la \
   libtalerexchange.la \
-  libtalertesting.la \
-  libtalerauditortesting.la
+  libtalertesting.la
 
 libtalerexchange_la_LDFLAGS = \
   -version-info 4:0:0 \
@@ -38,7 +39,13 @@ libtalerexchange_la_LIBADD = \
   -lgnunetutil \
   -ljansson \
   $(XLIB)
-
+if HAVE_LIBCURL
+libtalerexchange_la_LIBADD += -lcurl
+else
+if HAVE_LIBGNURL
+libtalerexchange_la_LIBADD += -lgnurl
+endif
+endif
 
 libtalerauditor_la_LDFLAGS = \
   -version-info 0:0:0 \
@@ -57,7 +64,6 @@ libtalerauditor_la_LIBADD = \
   -lgnunetutil \
   -ljansson \
   $(XLIB)
-
 if HAVE_LIBCURL
 libtalerauditor_la_LIBADD += -lcurl
 else
@@ -66,52 +72,62 @@ libtalerauditor_la_LIBADD += -lgnurl
 endif
 endif
 
-
 libtalertesting_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
 libtalertesting_la_SOURCES = \
   exchange_api_curl_defaults.c \
+  testing_api_cmd_auditor_deposit_confirmation.c \
+  testing_api_cmd_auditor_exchanges.c \
+  testing_api_cmd_auditor_exec_auditor.c \
+  testing_api_cmd_auditor_exec_auditor_dbinit.c \
+  testing_api_cmd_auditor_exec_wire_auditor.c \
+  testing_api_cmd_bank_admin_add_incoming.c \
+  testing_api_cmd_bank_check.c \
+  testing_api_cmd_bank_check_empty.c \
+  testing_api_cmd_bank_history_credit.c \
+  testing_api_cmd_bank_history_debit.c \
+  testing_api_cmd_bank_transfer.c \
+  testing_api_cmd_batch.c \
+  testing_api_cmd_check_keys.c \
+  testing_api_cmd_deposit.c \
   testing_api_cmd_exec_aggregator.c \
   testing_api_cmd_exec_wirewatch.c \
   testing_api_cmd_exec_keyup.c \
   testing_api_cmd_exec_auditor-sign.c \
-  testing_api_cmd_withdraw.c \
-  testing_api_cmd_wire.c \
+  testing_api_cmd_payback.c \
   testing_api_cmd_refund.c \
-  testing_api_cmd_status.c \
-  testing_api_cmd_deposit.c \
-  testing_api_cmd_sleep.c \
   testing_api_cmd_refresh.c \
-  testing_api_cmd_track.c \
-  testing_api_cmd_bank_check.c \
-  testing_api_cmd_bank_check_empty.c \
-  testing_api_cmd_payback.c \
-  testing_api_cmd_signal.c \
-  testing_api_cmd_check_keys.c \
-  testing_api_cmd_batch.c \
   testing_api_cmd_serialize_keys.c \
-  testing_api_helpers.c \
+  testing_api_cmd_signal.c \
+  testing_api_cmd_sleep.c \
+  testing_api_cmd_status.c \
+  testing_api_cmd_track.c \
+  testing_api_cmd_wire.c \
+  testing_api_cmd_withdraw.c \
+  testing_api_helpers_auditor.c \
+  testing_api_helpers_bank.c \
+  testing_api_helpers_exchange.c \
   testing_api_loop.c \
   testing_api_traits.c \
+  testing_api_trait_amount.c \
   testing_api_trait_blinding_key.c \
+  testing_api_trait_cmd.c \
   testing_api_trait_coin_priv.c \
   testing_api_trait_denom_pub.c \
   testing_api_trait_denom_sig.c \
   testing_api_trait_exchange_pub.c \
   testing_api_trait_exchange_sig.c \
+  testing_api_trait_fresh_coin.c \
   testing_api_trait_json.c \
+  testing_api_trait_key_peer.c \
+  testing_api_trait_number.c \
   testing_api_trait_process.c \
   testing_api_trait_reserve_pub.c \
   testing_api_trait_reserve_priv.c \
-  testing_api_trait_number.c \
-  testing_api_trait_fresh_coin.c \
   testing_api_trait_string.c \
-  testing_api_trait_key_peer.c \
-  testing_api_trait_wtid.c \
-  testing_api_trait_amount.c \
-  testing_api_trait_cmd.c \
-  testing_api_trait_time.c
+  testing_api_trait_time.c \
+  testing_api_trait_wtid.c
 libtalertesting_la_LIBADD = \
   libtalerexchange.la \
   $(top_builddir)/src/wire/libtalerwire.la \
@@ -125,72 +141,70 @@ libtalertesting_la_LIBADD = \
   -ljansson \
   $(XLIB)
 
-libtalerauditortesting_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-libtalerauditortesting_la_SOURCES = \
-  testing_auditor_api_helpers.c \
-  testing_auditor_api_cmd_deposit_confirmation.c \
-  testing_auditor_api_cmd_exchanges.c \
-  testing_auditor_api_cmd_exec_auditor.c \
-  testing_auditor_api_cmd_exec_auditor_dbinit.c \
-  testing_auditor_api_cmd_exec_wire_auditor.c
-libtalerauditortesting_la_LIBADD = \
-  libtalerauditor.la \
-  libtalerexchange.la \
-  libtalertesting.la \
-  $(top_builddir)/src/wire/libtalerwire.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetcurl \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
+# Testcases
 
-if HAVE_LIBCURL
-libtalerexchange_la_LIBADD += -lcurl
-else
-if HAVE_LIBGNURL
-libtalerexchange_la_LIBADD += -lgnurl
-endif
-endif
+AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export 
PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
 
 check_PROGRAMS = \
+  test_auditor_api \
+  test_auditor_api_version \
+  test_bank_api_with_fakebank \
+  test_bank_api_with_pybank \
+  test_exchange_api \
   test_exchange_api_keys_cherry_picking \
   test_exchange_api_overlapping_keys_bug \
-  test_exchange_api \
-  test_auditor_api_version \
-  test_auditor_api
-
+  test_taler_exchange_aggregator-postgres \
+  test_taler_exchange_wirewatch-postgres
 if HAVE_TWISTER
   check_PROGRAMS += \
-    test_exchange_api_twisted
+    test_exchange_api_twisted \
+    test_bank_api_with_fakebank_twisted \
+    test_bank_api_with_pybank_twisted
+endif
 
-test_exchange_api_twisted_SOURCES = \
-  test_exchange_api_twisted.c
-test_exchange_api_twisted_LDADD = \
-  $(LIBGCRYPT_LIBS) \
+TESTS = \
+  $(check_PROGRAMS)
+
+test_auditor_api_SOURCES = \
+  test_auditor_api.c
+test_auditor_api_LDADD = \
+  libtalerauditor.la \
   libtalertesting.la \
   libtalerexchange.la \
+  $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/bank-lib/libtalerbanktesting.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -ltalertwistertesting \
-  -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
 
-endif
+test_auditor_api_version_SOURCES = \
+  test_auditor_api_version.c
+test_auditor_api_version_LDADD = \
+  libtalerauditor.la \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson
 
-AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export 
PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
+test_bank_api_with_fakebank_SOURCES = \
+  test_bank_api.c
+test_bank_api_with_fakebank_LDADD = \
+  $(top_builddir)/src/lib/libtalertesting.la \
+  -ltalerexchange \
+  -lgnunetutil \
+  libtalerbank.la
 
-TESTS = \
-  $(check_PROGRAMS)
+test_bank_api_with_pybank_SOURCES = \
+  test_bank_api.c
+test_bank_api_with_pybank_LDADD = \
+  libtalertesting.la \
+  libtalerexchange.la \
+  -lgnunetutil \
+  $(top_builddir)/src/bank-lib/libtalerbank.la
 
 test_exchange_api_SOURCES = \
   test_exchange_api.c
@@ -200,16 +214,15 @@ test_exchange_api_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/bank-lib/libtalerfakebank.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalerbanktesting.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
 
-test_exchange_api_overlapping_keys_bug_SOURCES = \
-  test_exchange_api_overlapping_keys_bug.c
-test_exchange_api_overlapping_keys_bug_LDADD = \
+test_exchange_api_keys_cherry_picking_SOURCES = \
+  test_exchange_api_keys_cherry_picking.c
+test_exchange_api_keys_cherry_picking_LDADD = \
   libtalertesting.la \
   libtalerexchange.la \
   $(LIBGCRYPT_LIBS) \
@@ -220,9 +233,9 @@ test_exchange_api_overlapping_keys_bug_LDADD = \
   -lgnunetutil \
   -ljansson
 
-test_exchange_api_keys_cherry_picking_SOURCES = \
-  test_exchange_api_keys_cherry_picking.c
-test_exchange_api_keys_cherry_picking_LDADD = \
+test_exchange_api_overlapping_keys_bug_SOURCES = \
+  test_exchange_api_overlapping_keys_bug.c
+test_exchange_api_overlapping_keys_bug_LDADD = \
   libtalertesting.la \
   libtalerexchange.la \
   $(LIBGCRYPT_LIBS) \
@@ -233,37 +246,87 @@ test_exchange_api_keys_cherry_picking_LDADD = \
   -lgnunetutil \
   -ljansson
 
-test_auditor_api_SOURCES = \
-  test_auditor_api.c
-test_auditor_api_LDADD = \
-  libtalerauditortesting.la \
-  libtalerauditor.la \
+test_taler_exchange_aggregator_postgres_SOURCES = \
+  test_taler_exchange_aggregator.c
+test_taler_exchange_aggregator_postgres_LDADD = \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lmicrohttpd \
+  -lgnunetutil \
+  -lgnunetjson \
+  -ljansson \
+  -lpthread
+
+test_taler_exchange_wirewatch_postgres_SOURCES = \
+  test_taler_exchange_wirewatch.c
+test_taler_exchange_wirewatch_postgres_LDADD = \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lmicrohttpd \
+  -lgnunetutil \
+  -lgnunetjson \
+  -lgnunetpq \
+  -ljansson \
+  -lpthread
+
+test_exchange_api_twisted_SOURCES = \
+  test_exchange_api_twisted.c
+test_exchange_api_twisted_LDADD = \
+  $(LIBGCRYPT_LIBS) \
   libtalertesting.la \
   libtalerexchange.la \
-  $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/bank-lib/libtalerfakebank.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalerbanktesting.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
+  -ltalertwistertesting \
+  -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
 
+test_bank_api_with_fakebank_twisted_SOURCES = \
+  test_bank_api_twisted.c
+test_bank_api_with_fakebank_twisted_LDADD = \
+  $(top_builddir)/src/lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  -ltalertwistertesting \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson
 
-test_auditor_api_version_SOURCES = \
-  test_auditor_api_version.c
-test_auditor_api_version_LDADD = \
-  libtalerauditor.la \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/util/libtalerutil.la \
+test_bank_api_with_pybank_twisted_SOURCES = \
+  test_bank_api_twisted.c
+test_bank_api_with_pybank_twisted_LDADD = \
+  $(top_builddir)/src/lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  -ltalertwistertesting \
+  -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
 
 
+# Distribution
 
 EXTRA_DIST = \
+  bank.conf \
+  bank_twisted.conf \
+  test_auditor_api.conf \
+  test_auditor_api_expire_reserve_now.conf \
   test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv \
   test_exchange_api_home/.config/taler/account-2.json \
   test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json \
@@ -277,5 +340,5 @@ EXTRA_DIST = \
   test_exchange_api_keys_cherry_picking_extended.conf \
   test_exchange_api_keys_cherry_picking_extended_2.conf \
   test_exchange_api_expire_reserve_now.conf \
-  test_auditor_api.conf \
-  test_auditor_api_expire_reserve_now.conf
+  test-taler-exchange-aggregator-postgres.conf \
+  test-taler-exchange-wirewatch-postgres.conf
diff --git a/src/bank-lib/bank.conf b/src/lib/bank.conf
similarity index 100%
rename from src/bank-lib/bank.conf
rename to src/lib/bank.conf
diff --git a/src/bank-lib/bank_twisted.conf b/src/lib/bank_twisted.conf
similarity index 100%
rename from src/bank-lib/bank_twisted.conf
rename to src/lib/bank_twisted.conf
diff --git a/src/exchange/test-taler-exchange-aggregator-postgres.conf 
b/src/lib/test-taler-exchange-aggregator-postgres.conf
similarity index 100%
rename from src/exchange/test-taler-exchange-aggregator-postgres.conf
rename to src/lib/test-taler-exchange-aggregator-postgres.conf
diff --git a/src/exchange/test-taler-exchange-wirewatch-postgres.conf 
b/src/lib/test-taler-exchange-wirewatch-postgres.conf
similarity index 100%
rename from src/exchange/test-taler-exchange-wirewatch-postgres.conf
rename to src/lib/test-taler-exchange-wirewatch-postgres.conf
diff --git a/src/bank-lib/test_bank_api_twisted.c 
b/src/lib/test_bank_api_twisted.c
similarity index 100%
rename from src/bank-lib/test_bank_api_twisted.c
rename to src/lib/test_bank_api_twisted.c
diff --git a/src/exchange/test_taler_exchange_aggregator.c 
b/src/lib/test_taler_exchange_aggregator.c
similarity index 100%
rename from src/exchange/test_taler_exchange_aggregator.c
rename to src/lib/test_taler_exchange_aggregator.c
diff --git a/src/exchange/test_taler_exchange_wirewatch.c 
b/src/lib/test_taler_exchange_wirewatch.c
similarity index 100%
rename from src/exchange/test_taler_exchange_wirewatch.c
rename to src/lib/test_taler_exchange_wirewatch.c
diff --git a/src/lib/testing_auditor_api_cmd_deposit_confirmation.c 
b/src/lib/testing_api_cmd_auditor_deposit_confirmation.c
similarity index 100%
rename from src/lib/testing_auditor_api_cmd_deposit_confirmation.c
rename to src/lib/testing_api_cmd_auditor_deposit_confirmation.c
diff --git a/src/lib/testing_auditor_api_cmd_exchanges.c 
b/src/lib/testing_api_cmd_auditor_exchanges.c
similarity index 100%
rename from src/lib/testing_auditor_api_cmd_exchanges.c
rename to src/lib/testing_api_cmd_auditor_exchanges.c
diff --git a/src/lib/testing_auditor_api_cmd_exec_auditor.c 
b/src/lib/testing_api_cmd_auditor_exec_auditor.c
similarity index 100%
rename from src/lib/testing_auditor_api_cmd_exec_auditor.c
rename to src/lib/testing_api_cmd_auditor_exec_auditor.c
diff --git a/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c 
b/src/lib/testing_api_cmd_auditor_exec_auditor_dbinit.c
similarity index 100%
rename from src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
rename to src/lib/testing_api_cmd_auditor_exec_auditor_dbinit.c
diff --git a/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c 
b/src/lib/testing_api_cmd_auditor_exec_wire_auditor.c
similarity index 100%
rename from src/lib/testing_auditor_api_cmd_exec_wire_auditor.c
rename to src/lib/testing_api_cmd_auditor_exec_wire_auditor.c
diff --git a/src/bank-lib/testing_api_cmd_admin_add_incoming.c 
b/src/lib/testing_api_cmd_bank_admin_add_incoming.c
similarity index 100%
rename from src/bank-lib/testing_api_cmd_admin_add_incoming.c
rename to src/lib/testing_api_cmd_bank_admin_add_incoming.c
diff --git a/src/bank-lib/testing_api_cmd_history_credit.c 
b/src/lib/testing_api_cmd_bank_history_credit.c
similarity index 100%
rename from src/bank-lib/testing_api_cmd_history_credit.c
rename to src/lib/testing_api_cmd_bank_history_credit.c
diff --git a/src/bank-lib/testing_api_cmd_history_debit.c 
b/src/lib/testing_api_cmd_bank_history_debit.c
similarity index 100%
rename from src/bank-lib/testing_api_cmd_history_debit.c
rename to src/lib/testing_api_cmd_bank_history_debit.c
diff --git a/src/bank-lib/testing_api_cmd_transfer.c 
b/src/lib/testing_api_cmd_bank_transfer.c
similarity index 100%
rename from src/bank-lib/testing_api_cmd_transfer.c
rename to src/lib/testing_api_cmd_bank_transfer.c
diff --git a/src/lib/testing_auditor_api_helpers.c 
b/src/lib/testing_api_helpers_auditor.c
similarity index 100%
rename from src/lib/testing_auditor_api_helpers.c
rename to src/lib/testing_api_helpers_auditor.c
diff --git a/src/bank-lib/testing_api_helpers.c 
b/src/lib/testing_api_helpers_bank.c
similarity index 100%
rename from src/bank-lib/testing_api_helpers.c
rename to src/lib/testing_api_helpers_bank.c
diff --git a/src/lib/testing_api_helpers.c 
b/src/lib/testing_api_helpers_exchange.c
similarity index 100%
rename from src/lib/testing_api_helpers.c
rename to src/lib/testing_api_helpers_exchange.c

-- 
To stop receiving notification emails like this one, please contact
address@hidden.