diff --git a/.gitignore b/.gitignore index 278ce1c42..af6e0cfa9 100644 --- a/.gitignore +++ b/.gitignore @@ -47,16 +47,16 @@ src/lib/test_taler_exchange_httpd_home/.local/share/taler/exchange/wirefees/ src/lib/test_taler_exchange_httpd_home/.local/share/taler/auditor/ src/lib/test_taler_exchange_httpd_home/.local/share/taler/auditors/ -src/lib/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/live-keys/ -src/lib/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/ -src/lib/test_exchange_api_keys_cherry_picking_home/.local/share/taler/auditor/ -src/lib/test_exchange_api_keys_cherry_picking_home/.local/share/taler/auditors/ -src/lib/test_exchange_api_home/.local/share/taler/exchange/live-keys/ -src/lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/ -src/lib/test_exchange_api_home/.local/share/taler/auditor/ -src/lib/test_exchange_api_home/.local/share/taler/auditors/ +src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/live-keys/ +src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/ +src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/auditor/ +src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/auditors/ +src/testing/test_exchange_api_home/.local/share/taler/exchange/live-keys/ +src/testing/test_exchange_api_home/.local/share/taler/exchange/wirefees/ +src/testing/test_exchange_api_home/.local/share/taler/auditor/ +src/testing/test_exchange_api_home/.local/share/taler/auditors/ src/lib/auditor.in -src/lib/test_exchange_api_twisted +src/testing/test_exchange_api_twisted src/exchange/taler-exchange-aggregator src/exchange/test_taler_exchange_aggregator-postgres src/exchange/test_taler_exchange_httpd_home/.local/share/taler/exchange/live-keys/ diff --git a/configure.ac b/configure.ac index 8b2548e3b..8e6b6f260 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,7 @@ AC_CONFIG_FILES([Makefile src/exchangedb/Makefile src/exchange-tools/Makefile src/lib/Makefile + src/testing/Makefile src/benchmark/Makefile src/include/Makefile src/json/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 8ad3e88e9..4b07a1161 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,4 +25,5 @@ SUBDIRS = \ auditordb \ auditor \ lib \ + testing \ benchmark diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am index 03dfdf3b5..62aadf604 100644 --- a/src/benchmark/Makefile.am +++ b/src/benchmark/Makefile.am @@ -20,7 +20,7 @@ taler_exchange_benchmark_LDADD = \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ $(top_builddir)/src/lib/libtalerexchange.la \ - $(top_builddir)/src/lib/libtalertesting.la \ + $(top_builddir)/src/testing/libtalertesting.la \ $(top_builddir)/src/bank-lib/libtalerfakebank.la \ $(top_builddir)/src/bank-lib/libtalerbank.la \ -lgnunetjson \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 077616752..f03522a69 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,20 +1,21 @@ # This Makefile.am is in the public domain + AM_CPPFLAGS = \ - -I$(top_srcdir)/src/include \ - $(LIBGCRYPT_CFLAGS) \ - $(POSTGRESQL_CPPFLAGS) + -I$(top_srcdir)/src/include \ + $(LIBGCRYPT_CFLAGS) \ + $(POSTGRESQL_CPPFLAGS) if USE_COVERAGE AM_CFLAGS = --coverage -O0 XLIB = -lgcov endif + # Libraries lib_LTLIBRARIES = \ libtalerauditor.la \ - libtalerexchange.la \ - libtalertesting.la + libtalerexchange.la libtalerexchange_la_LDFLAGS = \ -version-info 4:0:0 \ @@ -62,294 +63,3 @@ libtalerauditor_la_LIBADD = \ -ljansson \ $(LIBGNURLCURL_LIBS) \ $(XLIB) - -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_admin_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_recoup.c \ - testing_api_cmd_refund.c \ - testing_api_cmd_refresh.c \ - testing_api_cmd_serialize_keys.c \ - testing_api_cmd_signal.c \ - testing_api_cmd_sleep.c \ - testing_api_cmd_status.c \ - testing_api_cmd_track.c \ - testing_api_cmd_wait.c \ - testing_api_cmd_wire.c \ - testing_api_cmd_withdraw.c \ - testing_api_cmd_insert_deposit.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_contract.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_merchant_key.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_string.c \ - testing_api_trait_time.c \ - testing_api_trait_wtid.c -libtalertesting_la_LIBADD = \ - libtalerexchange.la \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - $(top_builddir)/src/bank-lib/libtalerbank.la \ - $(top_builddir)/src/bank-lib/libtalerfakebank.la \ - -lgnunetcurl \ - -lgnunetjson \ - -lgnunetutil \ - -ljansson \ - $(XLIB) - -# Testcases - -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_revocation \ - test_exchange_api_overlapping_keys_bug \ - test_taler_exchange_aggregator-postgres \ - test_taler_exchange_wirewatch-postgres -if HAVE_TWISTER - check_PROGRAMS += \ - test_exchange_api_twisted \ - test_bank_api_with_fakebank_twisted \ - test_bank_api_with_pybank_twisted -endif - -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/libtalerbank.la \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - -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 \ - -lgnunetcurl \ - -lgnunetutil \ - -ljansson - -test_bank_api_with_fakebank_SOURCES = \ - test_bank_api.c -test_bank_api_with_fakebank_LDADD = \ - $(top_builddir)/src/lib/libtalertesting.la \ - -ltalerexchange \ - -lgnunetutil \ - $(top_builddir)/src/bank-lib/libtalerbank.la - -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 -test_exchange_api_LDADD = \ - libtalertesting.la \ - libtalerexchange.la \ - $(LIBGCRYPT_LIBS) \ - $(top_builddir)/src/bank-lib/libtalerfakebank.la \ - $(top_builddir)/src/bank-lib/libtalerbank.la \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - -lgnunetcurl \ - -lgnunetutil \ - -ljansson - -test_exchange_api_revocation_SOURCES = \ - test_exchange_api_revocation.c -test_exchange_api_revocation_LDADD = \ - libtalertesting.la \ - libtalerexchange.la \ - $(LIBGCRYPT_LIBS) \ - $(top_builddir)/src/bank-lib/libtalerfakebank.la \ - $(top_builddir)/src/bank-lib/libtalerbank.la \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - -lgnunetcurl \ - -lgnunetutil \ - -ljansson - -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) \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - $(top_builddir)/src/bank-lib/libtalerbank.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 = \ - libtalertesting.la \ - libtalerexchange.la \ - $(LIBGCRYPT_LIBS) \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - $(top_builddir)/src/bank-lib/libtalerbank.la \ - -lgnunetcurl \ - -lgnunetutil \ - -ljansson - -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 \ - $(top_builddir)/src/lib/libtalertesting.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 \ - $(top_builddir)/src/lib/libtalertesting.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 \ - $(top_builddir)/src/bank-lib/libtalerfakebank.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 - -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_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 = \ - test_bank_api.conf \ - test_bank_api_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 \ - test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \ - test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv \ - test_exchange_api_home/.config/taler/test.json \ - test_exchange_api_home/.config/taler/sepa.json \ - test_exchange_api.conf \ - test_exchange_api_twisted.conf \ - test_exchange_api_keys_cherry_picking.conf \ - 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-taler-exchange-aggregator-postgres.conf \ - test-taler-exchange-wirewatch-postgres.conf diff --git a/src/lib/.gitignore b/src/testing/.gitignore similarity index 100% rename from src/lib/.gitignore rename to src/testing/.gitignore diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am new file mode 100644 index 000000000..fd5fb9449 --- /dev/null +++ b/src/testing/Makefile.am @@ -0,0 +1,308 @@ +# This Makefile.am is in the public domain + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/include \ + $(LIBGCRYPT_CFLAGS) \ + $(POSTGRESQL_CPPFLAGS) + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov +endif + + +# Libraries + +lib_LTLIBRARIES = \ + libtalertesting.la + +libtalertesting_la_LDFLAGS = \ + -version-info 0:0:0 \ + -no-undefined +libtalertesting_la_SOURCES = \ + 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_admin_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_recoup.c \ + testing_api_cmd_refund.c \ + testing_api_cmd_refresh.c \ + testing_api_cmd_serialize_keys.c \ + testing_api_cmd_signal.c \ + testing_api_cmd_sleep.c \ + testing_api_cmd_status.c \ + testing_api_cmd_track.c \ + testing_api_cmd_wait.c \ + testing_api_cmd_wire.c \ + testing_api_cmd_withdraw.c \ + testing_api_cmd_insert_deposit.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_contract.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_merchant_key.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_string.c \ + testing_api_trait_time.c \ + testing_api_trait_wtid.c +libtalertesting_la_LIBADD = \ + $(top_builddir)/src/lib/libtalerexchange.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + -lgnunetcurl \ + -lgnunetjson \ + -lgnunetutil \ + -ljansson \ + $(XLIB) + + +# Test cases + +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_revocation \ + test_exchange_api_overlapping_keys_bug \ + test_taler_exchange_aggregator-postgres \ + test_taler_exchange_wirewatch-postgres +if HAVE_TWISTER + check_PROGRAMS += \ + test_exchange_api_twisted \ + test_bank_api_with_fakebank_twisted \ + test_bank_api_with_pybank_twisted +endif + +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/libtalerbank.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -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 \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + +test_bank_api_with_fakebank_SOURCES = \ + test_bank_api.c +test_bank_api_with_fakebank_LDADD = \ + $(top_builddir)/src/lib/libtalertesting.la \ + -ltalerexchange \ + -lgnunetutil \ + $(top_builddir)/src/bank-lib/libtalerbank.la + +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 +test_exchange_api_LDADD = \ + libtalertesting.la \ + libtalerexchange.la \ + $(LIBGCRYPT_LIBS) \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + +test_exchange_api_revocation_SOURCES = \ + test_exchange_api_revocation.c +test_exchange_api_revocation_LDADD = \ + libtalertesting.la \ + libtalerexchange.la \ + $(LIBGCRYPT_LIBS) \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + +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) \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/bank-lib/libtalerbank.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 = \ + libtalertesting.la \ + libtalerexchange.la \ + $(LIBGCRYPT_LIBS) \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + +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 \ + $(top_builddir)/src/lib/libtalertesting.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 \ + $(top_builddir)/src/lib/libtalertesting.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 \ + $(top_builddir)/src/bank-lib/libtalerfakebank.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 + +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_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 = \ + test_bank_api.conf \ + test_bank_api_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 \ + test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \ + test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv \ + test_exchange_api_home/.config/taler/test.json \ + test_exchange_api_home/.config/taler/sepa.json \ + test_exchange_api.conf \ + test_exchange_api_twisted.conf \ + test_exchange_api_keys_cherry_picking.conf \ + 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-taler-exchange-aggregator-postgres.conf \ + test-taler-exchange-wirewatch-postgres.conf diff --git a/src/lib/afl-generate.sh b/src/testing/afl-generate.sh similarity index 100% rename from src/lib/afl-generate.sh rename to src/testing/afl-generate.sh diff --git a/src/lib/baseline/admin_add_incoming.req b/src/testing/baseline/admin_add_incoming.req similarity index 100% rename from src/lib/baseline/admin_add_incoming.req rename to src/testing/baseline/admin_add_incoming.req diff --git a/src/lib/baseline/deposit.req b/src/testing/baseline/deposit.req similarity index 100% rename from src/lib/baseline/deposit.req rename to src/testing/baseline/deposit.req diff --git a/src/lib/baseline/keys.req b/src/testing/baseline/keys.req similarity index 100% rename from src/lib/baseline/keys.req rename to src/testing/baseline/keys.req diff --git a/src/lib/baseline/refresh_link.req b/src/testing/baseline/refresh_link.req similarity index 100% rename from src/lib/baseline/refresh_link.req rename to src/testing/baseline/refresh_link.req diff --git a/src/lib/baseline/refresh_melt.req b/src/testing/baseline/refresh_melt.req similarity index 100% rename from src/lib/baseline/refresh_melt.req rename to src/testing/baseline/refresh_melt.req diff --git a/src/lib/baseline/refresh_reveal.req b/src/testing/baseline/refresh_reveal.req similarity index 100% rename from src/lib/baseline/refresh_reveal.req rename to src/testing/baseline/refresh_reveal.req diff --git a/src/lib/baseline/reserve_status.req b/src/testing/baseline/reserve_status.req similarity index 100% rename from src/lib/baseline/reserve_status.req rename to src/testing/baseline/reserve_status.req diff --git a/src/lib/baseline/reserve_withdraw.req b/src/testing/baseline/reserve_withdraw.req similarity index 100% rename from src/lib/baseline/reserve_withdraw.req rename to src/testing/baseline/reserve_withdraw.req diff --git a/src/lib/baseline/wire.req b/src/testing/baseline/wire.req similarity index 100% rename from src/lib/baseline/wire.req rename to src/testing/baseline/wire.req diff --git a/src/lib/baseline/wire_sepa.req b/src/testing/baseline/wire_sepa.req similarity index 100% rename from src/lib/baseline/wire_sepa.req rename to src/testing/baseline/wire_sepa.req diff --git a/src/lib/baseline/wire_test.req b/src/testing/baseline/wire_test.req similarity index 100% rename from src/lib/baseline/wire_test.req rename to src/testing/baseline/wire_test.req diff --git a/src/lib/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf similarity index 100% rename from src/lib/test-taler-exchange-aggregator-postgres.conf rename to src/testing/test-taler-exchange-aggregator-postgres.conf diff --git a/src/lib/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf similarity index 100% rename from src/lib/test-taler-exchange-wirewatch-postgres.conf rename to src/testing/test-taler-exchange-wirewatch-postgres.conf diff --git a/src/lib/test_auditor_api.c b/src/testing/test_auditor_api.c similarity index 99% rename from src/lib/test_auditor_api.c rename to src/testing/test_auditor_api.c index d4971f6cf..922361026 100644 --- a/src/lib/test_auditor_api.c +++ b/src/testing/test_auditor_api.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_auditor_api.c + * @file testing/test_auditor_api.c * @brief testcase to test auditor's HTTP API interface * @author Christian Grothoff * @author Marcello Stanisci diff --git a/src/lib/test_auditor_api.conf b/src/testing/test_auditor_api.conf similarity index 100% rename from src/lib/test_auditor_api.conf rename to src/testing/test_auditor_api.conf diff --git a/src/lib/test_auditor_api_expire_reserve_now.conf b/src/testing/test_auditor_api_expire_reserve_now.conf similarity index 100% rename from src/lib/test_auditor_api_expire_reserve_now.conf rename to src/testing/test_auditor_api_expire_reserve_now.conf diff --git a/src/lib/test_auditor_api_version.c b/src/testing/test_auditor_api_version.c similarity index 98% rename from src/lib/test_auditor_api_version.c rename to src/testing/test_auditor_api_version.c index be85455d7..62277e828 100644 --- a/src/lib/test_auditor_api_version.c +++ b/src/testing/test_auditor_api_version.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_auditor_api_version.c + * @file testing/test_auditor_api_version.c * @brief testcase to test auditor's HTTP API interface to fetch /version * @author Christian Grothoff * @author Marcello Stanisci diff --git a/src/lib/test_bank_api.c b/src/testing/test_bank_api.c similarity index 99% rename from src/lib/test_bank_api.c rename to src/testing/test_bank_api.c index 4377c4fba..e7d2aefae 100644 --- a/src/lib/test_bank_api.c +++ b/src/testing/test_bank_api.c @@ -17,7 +17,7 @@ see */ /** - * @file bank/test_bank_api.c + * @file testing/test_bank_api.c * @brief testcase to test bank's HTTP API * interface against the fakebank * @author Marcello Stanisci diff --git a/src/lib/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf similarity index 100% rename from src/lib/test_bank_api_fakebank.conf rename to src/testing/test_bank_api_fakebank.conf diff --git a/src/lib/test_bank_api_fakebank_twisted.conf b/src/testing/test_bank_api_fakebank_twisted.conf similarity index 100% rename from src/lib/test_bank_api_fakebank_twisted.conf rename to src/testing/test_bank_api_fakebank_twisted.conf diff --git a/src/lib/test_bank_api_pybank.conf b/src/testing/test_bank_api_pybank.conf similarity index 100% rename from src/lib/test_bank_api_pybank.conf rename to src/testing/test_bank_api_pybank.conf diff --git a/src/lib/test_bank_api_pybank_twisted.conf b/src/testing/test_bank_api_pybank_twisted.conf similarity index 100% rename from src/lib/test_bank_api_pybank_twisted.conf rename to src/testing/test_bank_api_pybank_twisted.conf diff --git a/src/lib/test_bank_api_twisted.c b/src/testing/test_bank_api_twisted.c similarity index 99% rename from src/lib/test_bank_api_twisted.c rename to src/testing/test_bank_api_twisted.c index 2ec95ec03..fc167c1e1 100644 --- a/src/lib/test_bank_api_twisted.c +++ b/src/testing/test_bank_api_twisted.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_bank_api_with_fakebank_twisted.c + * @file testing/test_bank_api_with_fakebank_twisted.c * @author Marcello Stanisci * @author Sree Harsha Totakura * @author Christian Grothoff diff --git a/src/lib/test_exchange_api.c b/src/testing/test_exchange_api.c similarity index 99% rename from src/lib/test_exchange_api.c rename to src/testing/test_exchange_api.c index 67aeebccd..84d5dc9b4 100644 --- a/src/lib/test_exchange_api.c +++ b/src/testing/test_exchange_api.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_exchange_api.c + * @file testing/test_exchange_api.c * @brief testcase to test exchange's HTTP API interface * @author Sree Harsha Totakura * @author Christian Grothoff diff --git a/src/lib/test_exchange_api.conf b/src/testing/test_exchange_api.conf similarity index 100% rename from src/lib/test_exchange_api.conf rename to src/testing/test_exchange_api.conf diff --git a/src/lib/test_exchange_api_expire_reserve_now.conf b/src/testing/test_exchange_api_expire_reserve_now.conf similarity index 100% rename from src/lib/test_exchange_api_expire_reserve_now.conf rename to src/testing/test_exchange_api_expire_reserve_now.conf diff --git a/src/lib/test_exchange_api_home/.config/taler/account-1.json b/src/testing/test_exchange_api_home/.config/taler/account-1.json similarity index 100% rename from src/lib/test_exchange_api_home/.config/taler/account-1.json rename to src/testing/test_exchange_api_home/.config/taler/account-1.json diff --git a/src/lib/test_exchange_api_home/.config/taler/account-2.json b/src/testing/test_exchange_api_home/.config/taler/account-2.json similarity index 100% rename from src/lib/test_exchange_api_home/.config/taler/account-2.json rename to src/testing/test_exchange_api_home/.config/taler/account-2.json diff --git a/src/lib/test_exchange_api_home/.config/taler/sepa.json b/src/testing/test_exchange_api_home/.config/taler/sepa.json similarity index 100% rename from src/lib/test_exchange_api_home/.config/taler/sepa.json rename to src/testing/test_exchange_api_home/.config/taler/sepa.json diff --git a/src/lib/test_exchange_api_home/.config/taler/test.json b/src/testing/test_exchange_api_home/.config/taler/test.json similarity index 100% rename from src/lib/test_exchange_api_home/.config/taler/test.json rename to src/testing/test_exchange_api_home/.config/taler/test.json diff --git a/src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json similarity index 100% rename from src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json rename to src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json diff --git a/src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv similarity index 100% rename from src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv rename to src/testing/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv diff --git a/src/lib/test_exchange_api_interpreter_on-off.c b/src/testing/test_exchange_api_interpreter_on-off.c similarity index 98% rename from src/lib/test_exchange_api_interpreter_on-off.c rename to src/testing/test_exchange_api_interpreter_on-off.c index 95eb74da9..e0ef75090 100644 --- a/src/lib/test_exchange_api_interpreter_on-off.c +++ b/src/testing/test_exchange_api_interpreter_on-off.c @@ -18,7 +18,7 @@ */ /** - * @file lib/test_exchange_api_keys_cherry_picking_new.c + * @file testing/test_exchange_api_keys_cherry_picking_new.c * @brief testcase to test exchange's /keys cherry picking ability * @author Marcello Stanisci * @author Christian Grothoff diff --git a/src/lib/test_exchange_api_keys_cherry_picking.c b/src/testing/test_exchange_api_keys_cherry_picking.c similarity index 99% rename from src/lib/test_exchange_api_keys_cherry_picking.c rename to src/testing/test_exchange_api_keys_cherry_picking.c index 12ee26e60..a104b805a 100644 --- a/src/lib/test_exchange_api_keys_cherry_picking.c +++ b/src/testing/test_exchange_api_keys_cherry_picking.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_exchange_api_keys_cherry_picking.c + * @file testing/test_exchange_api_keys_cherry_picking.c * @brief testcase to test exchange's /keys cherry picking ability * @author Marcello Stanisci * @author Christian Grothoff diff --git a/src/lib/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf similarity index 100% rename from src/lib/test_exchange_api_keys_cherry_picking.conf rename to src/testing/test_exchange_api_keys_cherry_picking.conf diff --git a/src/lib/test_exchange_api_keys_cherry_picking_extended.conf b/src/testing/test_exchange_api_keys_cherry_picking_extended.conf similarity index 100% rename from src/lib/test_exchange_api_keys_cherry_picking_extended.conf rename to src/testing/test_exchange_api_keys_cherry_picking_extended.conf diff --git a/src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf b/src/testing/test_exchange_api_keys_cherry_picking_extended_2.conf similarity index 100% rename from src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf rename to src/testing/test_exchange_api_keys_cherry_picking_extended_2.conf diff --git a/src/lib/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json b/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json similarity index 100% rename from src/lib/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json rename to src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json diff --git a/src/lib/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv similarity index 100% rename from src/lib/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv rename to src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv diff --git a/src/lib/test_exchange_api_overlapping_keys_bug.c b/src/testing/test_exchange_api_overlapping_keys_bug.c similarity index 98% rename from src/lib/test_exchange_api_overlapping_keys_bug.c rename to src/testing/test_exchange_api_overlapping_keys_bug.c index a6fc018ab..f63d5da7e 100644 --- a/src/lib/test_exchange_api_overlapping_keys_bug.c +++ b/src/testing/test_exchange_api_overlapping_keys_bug.c @@ -18,7 +18,7 @@ */ /** - * @file lib/test_exchange_api_overlapping_keys_bug.c + * @file testing/test_exchange_api_overlapping_keys_bug.c * @brief testcase to test exchange's /keys cherry picking ability and * other /keys related operations * @author Marcello Stanisci diff --git a/src/lib/test_exchange_api_revocation.c b/src/testing/test_exchange_api_revocation.c similarity index 99% rename from src/lib/test_exchange_api_revocation.c rename to src/testing/test_exchange_api_revocation.c index 1c06340e8..110dec166 100644 --- a/src/lib/test_exchange_api_revocation.c +++ b/src/testing/test_exchange_api_revocation.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_exchange_api_revocation.c + * @file testing/test_exchange_api_revocation.c * @brief testcase to test key revocation handling via the exchange's HTTP API interface * @author Sree Harsha Totakura * @author Christian Grothoff diff --git a/src/lib/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c similarity index 99% rename from src/lib/test_exchange_api_twisted.c rename to src/testing/test_exchange_api_twisted.c index 5ae71128b..106cecdc5 100644 --- a/src/lib/test_exchange_api_twisted.c +++ b/src/testing/test_exchange_api_twisted.c @@ -17,7 +17,7 @@ */ /** - * @file lib/test_exchange_api_twisted.c + * @file testing/test_exchange_api_twisted.c * @brief testcase to test exchange's HTTP API interface * @author Marcello Stanisci * @author Sree Harsha Totakura diff --git a/src/lib/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf similarity index 100% rename from src/lib/test_exchange_api_twisted.conf rename to src/testing/test_exchange_api_twisted.conf diff --git a/src/lib/test_taler_exchange_aggregator.c b/src/testing/test_taler_exchange_aggregator.c similarity index 99% rename from src/lib/test_taler_exchange_aggregator.c rename to src/testing/test_taler_exchange_aggregator.c index 347aeb464..84695ca0e 100644 --- a/src/lib/test_taler_exchange_aggregator.c +++ b/src/testing/test_taler_exchange_aggregator.c @@ -15,7 +15,7 @@ */ /** - * @file lib/test_taler_exchange_aggregator.c + * @file testing/test_taler_exchange_aggregator.c * @brief Tests for taler-exchange-aggregator logic * @author Christian Grothoff * @author Marcello Stanisci diff --git a/src/lib/test_taler_exchange_httpd_home/.config/taler/account-1.json b/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json similarity index 100% rename from src/lib/test_taler_exchange_httpd_home/.config/taler/account-1.json rename to src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json diff --git a/src/lib/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv similarity index 100% rename from src/lib/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv rename to src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv diff --git a/src/lib/test_taler_exchange_wirewatch.c b/src/testing/test_taler_exchange_wirewatch.c similarity index 99% rename from src/lib/test_taler_exchange_wirewatch.c rename to src/testing/test_taler_exchange_wirewatch.c index 9760223d0..5a202bef0 100644 --- a/src/lib/test_taler_exchange_wirewatch.c +++ b/src/testing/test_taler_exchange_wirewatch.c @@ -15,7 +15,7 @@ */ /** - * @file lib/test_taler_exchange_wirewatch.c + * @file testing/test_taler_exchange_wirewatch.c * @brief Tests for taler-exchange-wirewatch and taler-exchange-aggregator logic; * Performs an invalid wire transfer to the exchange, and then checks that * wirewatch immediately sends the money back. diff --git a/src/lib/testing_api_cmd_auditor_deposit_confirmation.c b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c similarity index 99% rename from src/lib/testing_api_cmd_auditor_deposit_confirmation.c rename to src/testing/testing_api_cmd_auditor_deposit_confirmation.c index df80fef73..6115ceef6 100644 --- a/src/lib/testing_api_cmd_auditor_deposit_confirmation.c +++ b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_auditor_deposit_confirmation.c + * @file testing/testing_api_cmd_auditor_deposit_confirmation.c * @brief command for testing /deposit_confirmation. * @author Christian Grothoff */ diff --git a/src/lib/testing_api_cmd_auditor_exchanges.c b/src/testing/testing_api_cmd_auditor_exchanges.c similarity index 99% rename from src/lib/testing_api_cmd_auditor_exchanges.c rename to src/testing/testing_api_cmd_auditor_exchanges.c index d021b0d34..c7acaab9a 100644 --- a/src/lib/testing_api_cmd_auditor_exchanges.c +++ b/src/testing/testing_api_cmd_auditor_exchanges.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_auditor_exchanges.c + * @file testing/testing_api_cmd_auditor_exchanges.c * @brief command for testing /exchanges of the auditor * @author Christian Grothoff */ diff --git a/src/lib/testing_api_cmd_auditor_exec_auditor.c b/src/testing/testing_api_cmd_auditor_exec_auditor.c similarity index 97% rename from src/lib/testing_api_cmd_auditor_exec_auditor.c rename to src/testing/testing_api_cmd_auditor_exec_auditor.c index f56038e78..4e071d0c2 100644 --- a/src/lib/testing_api_cmd_auditor_exec_auditor.c +++ b/src/testing/testing_api_cmd_auditor_exec_auditor.c @@ -17,7 +17,7 @@ see */ /** - * @file lib/testing_api_cmd_auditor_exec_auditor.c + * @file testing/testing_api_cmd_auditor_exec_auditor.c * @brief run the taler-auditor command * @author Marcello Stanisci * @author Christian Grothoff @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "auditor_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_auditor_exec_auditor_dbinit.c b/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c similarity index 97% rename from src/lib/testing_api_cmd_auditor_exec_auditor_dbinit.c rename to src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c index 2cbe5197e..0c537747b 100644 --- a/src/lib/testing_api_cmd_auditor_exec_auditor_dbinit.c +++ b/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c @@ -17,7 +17,7 @@ see */ /** - * @file lib/testing_api_cmd_auditor_exec_auditor_dbinit.c + * @file testing/testing_api_cmd_auditor_exec_auditor_dbinit.c * @brief run the taler-auditor-dbinit "-r" command * @author Marcello Stanisci * @author Christian Grothoff @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "auditor_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_auditor_exec_wire_auditor.c b/src/testing/testing_api_cmd_auditor_exec_wire_auditor.c similarity index 97% rename from src/lib/testing_api_cmd_auditor_exec_wire_auditor.c rename to src/testing/testing_api_cmd_auditor_exec_wire_auditor.c index 458a0b349..5e3701fc9 100644 --- a/src/lib/testing_api_cmd_auditor_exec_wire_auditor.c +++ b/src/testing/testing_api_cmd_auditor_exec_wire_auditor.c @@ -17,7 +17,7 @@ see */ /** - * @file lib/testing_api_cmd_auditor_exec_wire_auditor.c + * @file testing/testing_api_cmd_auditor_exec_wire_auditor.c * @brief run the taler-wire-auditor command * @author Marcello Stanisci * @author Christian Grothoff @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "auditor_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_bank_admin_add_incoming.c b/src/testing/testing_api_cmd_bank_admin_add_incoming.c similarity index 99% rename from src/lib/testing_api_cmd_bank_admin_add_incoming.c rename to src/testing/testing_api_cmd_bank_admin_add_incoming.c index 4dea3d4df..2398c5be3 100644 --- a/src/lib/testing_api_cmd_bank_admin_add_incoming.c +++ b/src/testing/testing_api_cmd_bank_admin_add_incoming.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_admin_add_incoming.c + * @file testing/testing_api_cmd_bank_admin_add_incoming.c * @brief implementation of a bank /admin/add-incoming command * @author Christian Grothoff * @author Marcello Stanisci diff --git a/src/lib/testing_api_cmd_bank_admin_check.c b/src/testing/testing_api_cmd_bank_admin_check.c similarity index 98% rename from src/lib/testing_api_cmd_bank_admin_check.c rename to src/testing/testing_api_cmd_bank_admin_check.c index 97e2eade2..ced2a8c84 100644 --- a/src/lib/testing_api_cmd_bank_admin_check.c +++ b/src/testing/testing_api_cmd_bank_admin_check.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_admin_check.c + * @file testing/testing_api_cmd_bank_admin_check.c * @brief command to check if a particular admin/add-incoming transfer took * place. * @author Christian Grothoff @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" #include "taler_fakebank_lib.h" diff --git a/src/lib/testing_api_cmd_bank_check.c b/src/testing/testing_api_cmd_bank_check.c similarity index 99% rename from src/lib/testing_api_cmd_bank_check.c rename to src/testing/testing_api_cmd_bank_check.c index e8bd415b3..9d1f3e8ef 100644 --- a/src/lib/testing_api_cmd_bank_check.c +++ b/src/testing/testing_api_cmd_bank_check.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_check.c + * @file testing/testing_api_cmd_bank_check.c * @brief command to check if a particular wire transfer took * place. * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" #include "taler_fakebank_lib.h" diff --git a/src/lib/testing_api_cmd_bank_check_empty.c b/src/testing/testing_api_cmd_bank_check_empty.c similarity index 96% rename from src/lib/testing_api_cmd_bank_check_empty.c rename to src/testing/testing_api_cmd_bank_check_empty.c index f099afcb1..a26fd9bb1 100644 --- a/src/lib/testing_api_cmd_bank_check_empty.c +++ b/src/testing/testing_api_cmd_bank_check_empty.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_check_empty.c + * @file testing/testing_api_cmd_bank_check_empty.c * @brief command to check if a particular wire transfer took * place. * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" #include "taler_fakebank_lib.h" diff --git a/src/lib/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c similarity index 99% rename from src/lib/testing_api_cmd_bank_history_credit.c rename to src/testing/testing_api_cmd_bank_history_credit.c index 49317162e..8fb16fc6f 100644 --- a/src/lib/testing_api_cmd_bank_history_credit.c +++ b/src/testing/testing_api_cmd_bank_history_credit.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_history_credit.c + * @file testing/testing_api_cmd_bank_history_credit.c * @brief command to check the /history/incoming API from the bank. * @author Marcello Stanisci */ diff --git a/src/lib/testing_api_cmd_bank_history_debit.c b/src/testing/testing_api_cmd_bank_history_debit.c similarity index 99% rename from src/lib/testing_api_cmd_bank_history_debit.c rename to src/testing/testing_api_cmd_bank_history_debit.c index e1d47b01c..dea6bee95 100644 --- a/src/lib/testing_api_cmd_bank_history_debit.c +++ b/src/testing/testing_api_cmd_bank_history_debit.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_history_debit.c + * @file testing/testing_api_cmd_bank_history_debit.c * @brief command to check the /history/outgoing API from the bank. * @author Marcello Stanisci */ diff --git a/src/lib/testing_api_cmd_bank_transfer.c b/src/testing/testing_api_cmd_bank_transfer.c similarity index 99% rename from src/lib/testing_api_cmd_bank_transfer.c rename to src/testing/testing_api_cmd_bank_transfer.c index 11cf5d446..6aa926df8 100644 --- a/src/lib/testing_api_cmd_bank_transfer.c +++ b/src/testing/testing_api_cmd_bank_transfer.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_bank_transfer.c + * @file testing/testing_api_cmd_bank_transfer.c * @brief implementation of a bank /transfer command * @author Christian Grothoff * @author Marcello Stanisci diff --git a/src/lib/testing_api_cmd_batch.c b/src/testing/testing_api_cmd_batch.c similarity index 98% rename from src/lib/testing_api_cmd_batch.c rename to src/testing/testing_api_cmd_batch.c index 6d3c86ec0..fe7c19db2 100644 --- a/src/lib/testing_api_cmd_batch.c +++ b/src/testing/testing_api_cmd_batch.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_batch.c + * @file testing/testing_api_cmd_batch.c * @brief Implement batch-execution of CMDs. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_check_keys.c b/src/testing/testing_api_cmd_check_keys.c similarity index 99% rename from src/lib/testing_api_cmd_check_keys.c rename to src/testing/testing_api_cmd_check_keys.c index 3488af7ad..6e5c694cf 100644 --- a/src/lib/testing_api_cmd_check_keys.c +++ b/src/testing/testing_api_cmd_check_keys.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_check_keys.c + * @file testing/testing_api_cmd_check_keys.c * @brief Implementation of "check keys" test command. XXX-NOTE: * the number of 'expected keys' is NOT the number of the * downloaded keys, but rather the number of keys that the @@ -31,7 +31,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_deposit.c b/src/testing/testing_api_cmd_deposit.c similarity index 99% rename from src/lib/testing_api_cmd_deposit.c rename to src/testing/testing_api_cmd_deposit.c index f25fefc96..573c68b9c 100644 --- a/src/lib/testing_api_cmd_deposit.c +++ b/src/testing/testing_api_cmd_deposit.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_deposit.c + * @file testing/testing_api_cmd_deposit.c * @brief command for testing /deposit. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" #include "taler_signatures.h" #include "backoff.h" diff --git a/src/lib/testing_api_cmd_exec_aggregator.c b/src/testing/testing_api_cmd_exec_aggregator.c similarity index 98% rename from src/lib/testing_api_cmd_exec_aggregator.c rename to src/testing/testing_api_cmd_exec_aggregator.c index 425b3f23a..7602cf1d5 100644 --- a/src/lib/testing_api_cmd_exec_aggregator.c +++ b/src/testing/testing_api_cmd_exec_aggregator.c @@ -17,14 +17,13 @@ see */ /** - * @file lib/testing_api_cmd_exec_aggregator.c + * @file testing/testing_api_cmd_exec_aggregator.c * @brief run the taler-exchange-aggregator command * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_exec_auditor-sign.c b/src/testing/testing_api_cmd_exec_auditor-sign.c similarity index 98% rename from src/lib/testing_api_cmd_exec_auditor-sign.c rename to src/testing/testing_api_cmd_exec_auditor-sign.c index deda26686..fec7da7cb 100644 --- a/src/lib/testing_api_cmd_exec_auditor-sign.c +++ b/src/testing/testing_api_cmd_exec_auditor-sign.c @@ -18,14 +18,13 @@ */ /** - * @file lib/testing_api_cmd_exec_auditor-sign.c + * @file testing/testing_api_cmd_exec_auditor-sign.c * @brief run the taler-exchange-aggregator command * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_exec_keyup.c b/src/testing/testing_api_cmd_exec_keyup.c similarity index 98% rename from src/lib/testing_api_cmd_exec_keyup.c rename to src/testing/testing_api_cmd_exec_keyup.c index 3947ad26e..cc4fb9e2e 100644 --- a/src/lib/testing_api_cmd_exec_keyup.c +++ b/src/testing/testing_api_cmd_exec_keyup.c @@ -18,7 +18,7 @@ */ /** - * @file lib/testing_api_cmd_exec_keyup.c + * @file testing/testing_api_cmd_exec_keyup.c * @brief run the taler-exchange-keyup command * @author Marcello Stanisci * @author Christian Grothoff @@ -26,7 +26,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_exec_wirewatch.c b/src/testing/testing_api_cmd_exec_wirewatch.c similarity index 98% rename from src/lib/testing_api_cmd_exec_wirewatch.c rename to src/testing/testing_api_cmd_exec_wirewatch.c index 75f8f46e4..44de96838 100644 --- a/src/lib/testing_api_cmd_exec_wirewatch.c +++ b/src/testing/testing_api_cmd_exec_wirewatch.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_exec_wirewatch.c + * @file testing/testing_api_cmd_exec_wirewatch.c * @brief run the taler-exchange-wirewatch command * @author Christian Grothoff * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_insert_deposit.c b/src/testing/testing_api_cmd_insert_deposit.c similarity index 99% rename from src/lib/testing_api_cmd_insert_deposit.c rename to src/testing/testing_api_cmd_insert_deposit.c index 1f257574f..b66a4bfa9 100644 --- a/src/lib/testing_api_cmd_insert_deposit.c +++ b/src/testing/testing_api_cmd_insert_deposit.c @@ -17,7 +17,7 @@ see */ /** - * @file lib/testing_api_cmd_insert_deposit.c + * @file testing/testing_api_cmd_insert_deposit.c * @brief deposit a coin directly into the database. * @author Marcello Stanisci * @author Christian Grothoff @@ -26,7 +26,6 @@ #include "taler_util.h" #include "taler_json_lib.h" #include -#include "auditor_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" #include "taler_exchangedb_plugin.h" diff --git a/src/lib/testing_api_cmd_recoup.c b/src/testing/testing_api_cmd_recoup.c similarity index 99% rename from src/lib/testing_api_cmd_recoup.c rename to src/testing/testing_api_cmd_recoup.c index 63319d4f8..c12f67f6e 100644 --- a/src/lib/testing_api_cmd_recoup.c +++ b/src/testing/testing_api_cmd_recoup.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_recoup.c + * @file testing/testing_api_cmd_recoup.c * @brief Implement the /revoke and /recoup test commands. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c similarity index 99% rename from src/lib/testing_api_cmd_refresh.c rename to src/testing/testing_api_cmd_refresh.c index 575f1a0c6..73b74dafb 100644 --- a/src/lib/testing_api_cmd_refresh.c +++ b/src/testing/testing_api_cmd_refresh.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_refresh.c + * @file testing/testing_api_cmd_refresh.c * @brief commands for testing all "refresh" features. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" #include "taler_signatures.h" #include "backoff.h" diff --git a/src/lib/testing_api_cmd_refund.c b/src/testing/testing_api_cmd_refund.c similarity index 99% rename from src/lib/testing_api_cmd_refund.c rename to src/testing/testing_api_cmd_refund.c index a45303806..0150086e0 100644 --- a/src/lib/testing_api_cmd_refund.c +++ b/src/testing/testing_api_cmd_refund.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_refund.c + * @file testing/testing_api_cmd_refund.c * @brief Implement the /refund test command, plus other * corollary commands (?). * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_serialize_keys.c b/src/testing/testing_api_cmd_serialize_keys.c similarity index 98% rename from src/lib/testing_api_cmd_serialize_keys.c rename to src/testing/testing_api_cmd_serialize_keys.c index e18a25b77..296a2ddc7 100644 --- a/src/lib/testing_api_cmd_serialize_keys.c +++ b/src/testing/testing_api_cmd_serialize_keys.c @@ -17,13 +17,12 @@ */ /** - * @file lib/testing_api_cmd_serialize_keys.c + * @file testing/testing_api_cmd_serialize_keys.c * @brief Lets tests use the keys serialization API. * @author Marcello Stanisci */ #include "platform.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_signal.c b/src/testing/testing_api_cmd_signal.c similarity index 97% rename from src/lib/testing_api_cmd_signal.c rename to src/testing/testing_api_cmd_signal.c index cca8e02bd..b2116ebf6 100644 --- a/src/lib/testing_api_cmd_signal.c +++ b/src/testing/testing_api_cmd_signal.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_signal.c + * @file testing/testing_api_cmd_signal.c * @brief command(s) to send signals to processes. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_sleep.c b/src/testing/testing_api_cmd_sleep.c similarity index 97% rename from src/lib/testing_api_cmd_sleep.c rename to src/testing/testing_api_cmd_sleep.c index f7af53e51..91c13a1e2 100644 --- a/src/lib/testing_api_cmd_sleep.c +++ b/src/testing/testing_api_cmd_sleep.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_sleep.c + * @file testing/testing_api_cmd_sleep.c * @brief command(s) to sleep for a bit * @author Christian Grothoff */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_status.c b/src/testing/testing_api_cmd_status.c similarity index 98% rename from src/lib/testing_api_cmd_status.c rename to src/testing/testing_api_cmd_status.c index 41d2c326e..1c652b6d4 100644 --- a/src/lib/testing_api_cmd_status.c +++ b/src/testing/testing_api_cmd_status.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_status.c + * @file testing/testing_api_cmd_status.c * @brief Implement the /reserve/status test command. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_track.c b/src/testing/testing_api_cmd_track.c similarity index 99% rename from src/lib/testing_api_cmd_track.c rename to src/testing/testing_api_cmd_track.c index 51ad45be4..e5c7160f6 100644 --- a/src/lib/testing_api_cmd_track.c +++ b/src/testing/testing_api_cmd_track.c @@ -18,14 +18,13 @@ */ /** - * @file lib/testing_api_cmd_track.c + * @file testing/testing_api_cmd_track.c * @brief Implement the testing CMDs for the /track operations. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" /** diff --git a/src/lib/testing_api_cmd_wait.c b/src/testing/testing_api_cmd_wait.c similarity index 97% rename from src/lib/testing_api_cmd_wait.c rename to src/testing/testing_api_cmd_wait.c index d153229ce..5558f7b95 100644 --- a/src/lib/testing_api_cmd_wait.c +++ b/src/testing/testing_api_cmd_wait.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_wait.c + * @file testing/testing_api_cmd_wait.c * @brief command(s) to wait on some process * @author Christian Grothoff */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_wire.c b/src/testing/testing_api_cmd_wire.c similarity index 98% rename from src/lib/testing_api_cmd_wire.c rename to src/testing/testing_api_cmd_wire.c index e8bf176a6..5d1f2454f 100644 --- a/src/lib/testing_api_cmd_wire.c +++ b/src/testing/testing_api_cmd_wire.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_cmd_wire.c + * @file testing/testing_api_cmd_wire.c * @brief command for testing /wire. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c similarity index 99% rename from src/lib/testing_api_cmd_withdraw.c rename to src/testing/testing_api_cmd_withdraw.c index 3a834c07b..b62420557 100644 --- a/src/lib/testing_api_cmd_withdraw.c +++ b/src/testing/testing_api_cmd_withdraw.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_cmd_withdraw.c + * @file testing/testing_api_cmd_withdraw.c * @brief main interpreter loop for testcases * @author Christian Grothoff * @author Marcello Stanisci @@ -26,7 +26,6 @@ #include "taler_json_lib.h" #include #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" #include "backoff.h" diff --git a/src/lib/testing_api_helpers_auditor.c b/src/testing/testing_api_helpers_auditor.c similarity index 99% rename from src/lib/testing_api_helpers_auditor.c rename to src/testing/testing_api_helpers_auditor.c index 26585f5b9..ccfa5e24e 100644 --- a/src/lib/testing_api_helpers_auditor.c +++ b/src/testing/testing_api_helpers_auditor.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_helpers_auditor.c + * @file testing/testing_api_helpers_auditor.c * @brief helper functions * @author Christian Grothoff */ diff --git a/src/lib/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c similarity index 99% rename from src/lib/testing_api_helpers_bank.c rename to src/testing/testing_api_helpers_bank.c index c8a780ac6..dbe89e63c 100644 --- a/src/lib/testing_api_helpers_bank.c +++ b/src/testing/testing_api_helpers_bank.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_helpers_bank.c + * @file testing/testing_api_helpers_bank.c * @brief convenience functions for bank tests. * @author Marcello Stanisci * @author Christian Grothoff diff --git a/src/lib/testing_api_helpers_exchange.c b/src/testing/testing_api_helpers_exchange.c similarity index 99% rename from src/lib/testing_api_helpers_exchange.c rename to src/testing/testing_api_helpers_exchange.c index 5979fc015..29c96db19 100644 --- a/src/lib/testing_api_helpers_exchange.c +++ b/src/testing/testing_api_helpers_exchange.c @@ -18,7 +18,7 @@ */ /** - * @file lib/testing_api_helpers_exchange.c + * @file testing/testing_api_helpers_exchange.c * @brief helper functions * @author Christian Grothoff * @author Marcello Stanisci @@ -26,7 +26,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_loop.c b/src/testing/testing_api_loop.c similarity index 99% rename from src/lib/testing_api_loop.c rename to src/testing/testing_api_loop.c index 06151d02c..a7a5a23a4 100644 --- a/src/lib/testing_api_loop.c +++ b/src/testing/testing_api_loop.c @@ -18,7 +18,7 @@ */ /** - * @file lib/testing_api_loop.c + * @file testing/testing_api_loop.c * @brief main interpreter loop for testcases * @author Christian Grothoff * @author Marcello Stanisci @@ -26,7 +26,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" #include "taler_fakebank_lib.h" diff --git a/src/lib/testing_api_trait_amount.c b/src/testing/testing_api_trait_amount.c similarity index 96% rename from src/lib/testing_api_trait_amount.c rename to src/testing/testing_api_trait_amount.c index b33259e5d..96698b49e 100644 --- a/src/lib/testing_api_trait_amount.c +++ b/src/testing/testing_api_trait_amount.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_amount.c + * @file testing/testing_api_trait_amount.c * @brief offer amounts as traits. * @author Marcello Stanisci */ @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_blinding_key.c b/src/testing/testing_api_trait_blinding_key.c similarity index 96% rename from src/lib/testing_api_trait_blinding_key.c rename to src/testing/testing_api_trait_blinding_key.c index f20116870..ae1889a1f 100644 --- a/src/lib/testing_api_trait_blinding_key.c +++ b/src/testing/testing_api_trait_blinding_key.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_blinding_key.c + * @file testing/testing_api_trait_blinding_key.c * @brief offer blinding keys as traits. * @author Christian Grothoff * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_cmd.c b/src/testing/testing_api_trait_cmd.c similarity index 97% rename from src/lib/testing_api_trait_cmd.c rename to src/testing/testing_api_trait_cmd.c index 7982f8e8d..f24054713 100644 --- a/src/lib/testing_api_trait_cmd.c +++ b/src/testing/testing_api_trait_cmd.c @@ -18,14 +18,13 @@ */ /** - * @file lib/testing_api_trait_cmd.c + * @file testing/testing_api_trait_cmd.c * @brief offers CMDs as traits. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_coin_priv.c b/src/testing/testing_api_trait_coin_priv.c similarity index 96% rename from src/lib/testing_api_trait_coin_priv.c rename to src/testing/testing_api_trait_coin_priv.c index a8b496e77..61a770cf6 100644 --- a/src/lib/testing_api_trait_coin_priv.c +++ b/src/testing/testing_api_trait_coin_priv.c @@ -18,7 +18,7 @@ */ /** - * @file lib/testing_api_trait_coin_priv.c + * @file testing/testing_api_trait_coin_priv.c * @brief coin priv traits. * @author Christian Grothoff * @author Marcello Stanisci @@ -26,7 +26,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_contract.c b/src/testing/testing_api_trait_contract.c similarity index 97% rename from src/lib/testing_api_trait_contract.c rename to src/testing/testing_api_trait_contract.c index 0fe741774..1e88cb86f 100644 --- a/src/lib/testing_api_trait_contract.c +++ b/src/testing/testing_api_trait_contract.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_contract.c + * @file testing/testing_api_trait_contract.c * @brief offers contract term trait. * @author Marcello Stanisci * @author Christian Grothoff diff --git a/src/lib/testing_api_trait_denom_pub.c b/src/testing/testing_api_trait_denom_pub.c similarity index 96% rename from src/lib/testing_api_trait_denom_pub.c rename to src/testing/testing_api_trait_denom_pub.c index 7217495c6..f866588db 100644 --- a/src/lib/testing_api_trait_denom_pub.c +++ b/src/testing/testing_api_trait_denom_pub.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_denom_pub.c + * @file testing/testing_api_trait_denom_pub.c * @brief denom pub traits. * @author Christian Grothoff * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_denom_sig.c b/src/testing/testing_api_trait_denom_sig.c similarity index 96% rename from src/lib/testing_api_trait_denom_sig.c rename to src/testing/testing_api_trait_denom_sig.c index 9f6e2b984..07e89440e 100644 --- a/src/lib/testing_api_trait_denom_sig.c +++ b/src/testing/testing_api_trait_denom_sig.c @@ -18,7 +18,7 @@ */ /** - * @file lib/testing_api_trait_denom_sig.c + * @file testing/testing_api_trait_denom_sig.c * @brief offer denomination signatures as traits * @author Christian Grothoff * @author Marcello Stanisci @@ -26,7 +26,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_exchange_pub.c b/src/testing/testing_api_trait_exchange_pub.c similarity index 96% rename from src/lib/testing_api_trait_exchange_pub.c rename to src/testing/testing_api_trait_exchange_pub.c index a7fc215e2..8c7027260 100644 --- a/src/lib/testing_api_trait_exchange_pub.c +++ b/src/testing/testing_api_trait_exchange_pub.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_trait_exchange_pub.c + * @file testing/testing_api_trait_exchange_pub.c * @brief exchange pub traits. * @author Christian Grothoff */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_exchange_sig.c b/src/testing/testing_api_trait_exchange_sig.c similarity index 96% rename from src/lib/testing_api_trait_exchange_sig.c rename to src/testing/testing_api_trait_exchange_sig.c index ffb084a54..349454ae7 100644 --- a/src/lib/testing_api_trait_exchange_sig.c +++ b/src/testing/testing_api_trait_exchange_sig.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_trait_exchange_sig.c + * @file testing/testing_api_trait_exchange_sig.c * @brief exchange pub traits. * @author Christian Grothoff */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_fresh_coin.c b/src/testing/testing_api_trait_fresh_coin.c similarity index 96% rename from src/lib/testing_api_trait_fresh_coin.c rename to src/testing/testing_api_trait_fresh_coin.c index 48a57d26f..e5f1c6827 100644 --- a/src/lib/testing_api_trait_fresh_coin.c +++ b/src/testing/testing_api_trait_fresh_coin.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_trait_fresh_coin.c + * @file testing/testing_api_trait_fresh_coin.c * @brief traits to offer fresh conins (after "melt" operations) * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_json.c b/src/testing/testing_api_trait_json.c similarity index 97% rename from src/lib/testing_api_trait_json.c rename to src/testing/testing_api_trait_json.c index f7739aa8e..cbddad53e 100644 --- a/src/lib/testing_api_trait_json.c +++ b/src/testing/testing_api_trait_json.c @@ -18,14 +18,13 @@ */ /** - * @file lib/testing_api_trait_json.c + * @file testing/testing_api_trait_json.c * @brief offers JSON traits. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_merchant_key.c b/src/testing/testing_api_trait_merchant_key.c similarity index 97% rename from src/lib/testing_api_trait_merchant_key.c rename to src/testing/testing_api_trait_merchant_key.c index 1657560d3..41b6b8883 100644 --- a/src/lib/testing_api_trait_merchant_key.c +++ b/src/testing/testing_api_trait_merchant_key.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_trait_merchant_key.c + * @file testing/testing_api_trait_merchant_key.c * @brief traits to offer peer's (private) keys * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_number.c b/src/testing/testing_api_trait_number.c similarity index 98% rename from src/lib/testing_api_trait_number.c rename to src/testing/testing_api_trait_number.c index c644b8e31..50ce6d8c7 100644 --- a/src/lib/testing_api_trait_number.c +++ b/src/testing/testing_api_trait_number.c @@ -17,14 +17,13 @@ */ /** - * @file lib/testing_api_trait_number.c + * @file testing/testing_api_trait_number.c * @brief traits to offer numbers * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_process.c b/src/testing/testing_api_trait_process.c similarity index 96% rename from src/lib/testing_api_trait_process.c rename to src/testing/testing_api_trait_process.c index 26b2f0e05..3d2af31fd 100644 --- a/src/lib/testing_api_trait_process.c +++ b/src/testing/testing_api_trait_process.c @@ -18,7 +18,7 @@ */ /** - * @file lib/testing_api_trait_process.c + * @file testing/testing_api_trait_process.c * @brief trait offering process handles. * @author Christian Grothoff * @author Marcello Stanisci @@ -26,7 +26,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_reserve_priv.c b/src/testing/testing_api_trait_reserve_priv.c similarity index 96% rename from src/lib/testing_api_trait_reserve_priv.c rename to src/testing/testing_api_trait_reserve_priv.c index 3d79b356a..f4a4ef500 100644 --- a/src/lib/testing_api_trait_reserve_priv.c +++ b/src/testing/testing_api_trait_reserve_priv.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_reserve_priv.c + * @file testing/testing_api_trait_reserve_priv.c * @brief implements reserve private key trait * @author Christian Grothoff * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_reserve_pub.c b/src/testing/testing_api_trait_reserve_pub.c similarity index 96% rename from src/lib/testing_api_trait_reserve_pub.c rename to src/testing/testing_api_trait_reserve_pub.c index 997ceee75..a158114be 100644 --- a/src/lib/testing_api_trait_reserve_pub.c +++ b/src/testing/testing_api_trait_reserve_pub.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_reserve_pub.c + * @file testing/testing_api_trait_reserve_pub.c * @brief implements reserve public key trait * @author Christian Grothoff * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_string.c b/src/testing/testing_api_trait_string.c similarity index 98% rename from src/lib/testing_api_trait_string.c rename to src/testing/testing_api_trait_string.c index 0c7a606ff..381760113 100644 --- a/src/lib/testing_api_trait_string.c +++ b/src/testing/testing_api_trait_string.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_trait_string.c + * @file testing/testing_api_trait_string.c * @brief offers strings traits. * @author Marcello Stanisci * @author Christian Grothoff @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_time.c b/src/testing/testing_api_trait_time.c similarity index 96% rename from src/lib/testing_api_trait_time.c rename to src/testing/testing_api_trait_time.c index 6e6128a61..c77489bfa 100644 --- a/src/lib/testing_api_trait_time.c +++ b/src/testing/testing_api_trait_time.c @@ -18,14 +18,13 @@ */ /** - * @file lib/testing_api_trait_time.c + * @file testing/testing_api_trait_time.c * @brief traits to offer time stamps. * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_trait_wtid.c b/src/testing/testing_api_trait_wtid.c similarity index 96% rename from src/lib/testing_api_trait_wtid.c rename to src/testing/testing_api_trait_wtid.c index 65390b8c9..5c7e7060e 100644 --- a/src/lib/testing_api_trait_wtid.c +++ b/src/testing/testing_api_trait_wtid.c @@ -18,14 +18,13 @@ */ /** - * @file lib/testing_api_trait_number.c + * @file testing/testing_api_trait_number.c * @brief traits to offer numbers * @author Marcello Stanisci */ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h" diff --git a/src/lib/testing_api_traits.c b/src/testing/testing_api_traits.c similarity index 96% rename from src/lib/testing_api_traits.c rename to src/testing/testing_api_traits.c index 366e7e718..6d623af7a 100644 --- a/src/lib/testing_api_traits.c +++ b/src/testing/testing_api_traits.c @@ -17,7 +17,7 @@ */ /** - * @file lib/testing_api_traits.c + * @file testing/testing_api_traits.c * @brief loop for trait resolution * @author Christian Grothoff * @author Marcello Stanisci @@ -25,7 +25,6 @@ #include "platform.h" #include "taler_json_lib.h" #include -#include "exchange_api_handle.h" #include "taler_signatures.h" #include "taler_testing_lib.h"