From 54fc83ee6b910d482948c6ec8185df7aab1b0cb1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 11 Jan 2019 21:27:34 +0100 Subject: [PATCH] fix cyclic dependency by combining exchange-lib and auditor-lib directories --- .gitignore | 22 ++--- configure.ac | 3 +- src/Makefile.am | 6 +- src/auditor-lib/Makefile.am | 90 ------------------ src/auditor-lib/backoff.h | 38 -------- .../taler/auditor/offline-keys/auditor.priv | 1 - .../taler/exchange/wirefees/x-taler-bank.fee | Bin 600 -> 0 bytes src/benchmark/Makefile.am | 4 +- .../.config/taler/account-1.json | 5 - .../.config/taler/account-2.json | 4 - .../.config/taler/sepa.json | 9 -- .../.config/taler/test.json | 8 -- .../.config/taler/x-taler-bank.json | 4 - .../taler/exchange/offline-keys/master.priv | 1 - src/{exchange-lib => lib}/Makefile.am | 90 ++++++++++++++++-- src/{exchange-lib => lib}/afl-generate.sh | 0 .../auditor_api_curl_defaults.c} | 2 +- .../auditor_api_curl_defaults.h} | 0 .../auditor_api_deposit_confirmation.c | 2 +- .../auditor_api_exchanges.c | 2 +- src/{auditor-lib => lib}/auditor_api_handle.c | 4 +- src/{auditor-lib => lib}/auditor_api_handle.h | 0 src/{exchange-lib => lib}/backoff.h | 0 .../baseline/admin_add_incoming.req | 0 .../baseline/deposit.req | 0 src/{exchange-lib => lib}/baseline/keys.req | 0 .../baseline/refresh_link.req | 0 .../baseline/refresh_melt.req | 0 .../baseline/refresh_reveal.req | 0 .../baseline/reserve_status.req | 0 .../baseline/reserve_withdraw.req | 0 src/{exchange-lib => lib}/baseline/wire.req | 0 .../baseline/wire_sepa.req | 0 .../baseline/wire_test.req | 0 .../exchange_api_common.c | 0 .../exchange_api_curl_defaults.c} | 4 +- .../exchange_api_curl_defaults.h} | 2 +- .../exchange_api_deposit.c | 8 +- .../exchange_api_handle.c | 20 ++-- .../exchange_api_handle.h | 0 .../exchange_api_payback.c | 2 +- .../exchange_api_refresh.c | 2 +- .../exchange_api_refresh_link.c | 2 +- .../exchange_api_refund.c | 4 +- .../exchange_api_reserve.c | 2 +- .../exchange_api_track_transaction.c | 2 +- .../exchange_api_track_transfer.c | 2 +- src/{exchange-lib => lib}/exchange_api_wire.c | 2 +- src/{auditor-lib => lib}/test_auditor_api.c | 0 .../test_auditor_api.conf | 0 .../test_auditor_api_expire_reserve_now.conf | 0 .../test_exchange_api.conf | 0 .../test_exchange_api_expire_reserve_now.conf | 0 .../.config/taler/account-1.json | 0 .../.config/taler/account-2.json | 0 .../.config/taler/sepa.json | 0 .../.config/taler/test.json | 0 .../.config/taler/x-taler-bank.json | 0 .../taler/exchange/offline-keys/master.priv | 0 ...test_exchange_api_keys_cherry_picking.conf | 0 ...ange_api_keys_cherry_picking_extended.conf | 0 ...ge_api_keys_cherry_picking_extended_2.conf | 0 ...est_exchange_api_keys_cherry_picking_new.c | 0 .../test_exchange_api_new.c | 0 .../test_exchange_api_overlapping_keys_bug.c | 0 .../test_exchange_api_twisted.c | 0 .../test_exchange_api_twisted.conf | 0 .../testing_api_cmd_bank_check.c | 0 .../testing_api_cmd_batch.c | 0 .../testing_api_cmd_check_keys.c | 0 .../testing_api_cmd_deposit.c | 0 .../testing_api_cmd_exec_aggregator.c | 0 .../testing_api_cmd_exec_auditor-sign.c | 0 .../testing_api_cmd_exec_keyup.c | 0 .../testing_api_cmd_exec_wirewatch.c | 0 .../testing_api_cmd_fakebank_transfer.c | 0 .../testing_api_cmd_payback.c | 0 .../testing_api_cmd_refresh.c | 0 .../testing_api_cmd_refund.c | 0 .../testing_api_cmd_serialize_keys.c | 0 .../testing_api_cmd_signal.c | 0 .../testing_api_cmd_sleep.c | 0 .../testing_api_cmd_status.c | 0 .../testing_api_cmd_track.c | 0 .../testing_api_cmd_wire.c | 0 .../testing_api_cmd_withdraw.c | 0 .../testing_api_helpers.c | 0 src/{exchange-lib => lib}/testing_api_loop.c | 0 .../testing_api_trait_amount.c | 0 .../testing_api_trait_blinding_key.c | 0 .../testing_api_trait_cmd.c | 0 .../testing_api_trait_coin_priv.c | 0 .../testing_api_trait_denom_pub.c | 0 .../testing_api_trait_denom_sig.c | 0 .../testing_api_trait_exchange_pub.c | 0 .../testing_api_trait_exchange_sig.c | 0 .../testing_api_trait_fresh_coin.c | 0 .../testing_api_trait_json.c | 0 .../testing_api_trait_key_peer.c | 0 .../testing_api_trait_number.c | 0 .../testing_api_trait_process.c | 0 .../testing_api_trait_reserve_priv.c | 0 .../testing_api_trait_string.c | 0 .../testing_api_trait_wtid.c | 0 .../testing_api_traits.c | 0 ...ing_auditor_api_cmd_deposit_confirmation.c | 2 +- .../testing_auditor_api_cmd_exchanges.c | 8 +- .../testing_auditor_api_cmd_exec_auditor.c | 0 ...ting_auditor_api_cmd_exec_auditor_dbinit.c | 0 ...esting_auditor_api_cmd_exec_wire_auditor.c | 0 .../testing_auditor_api_helpers.c | 0 111 files changed, 135 insertions(+), 222 deletions(-) delete mode 100644 src/auditor-lib/Makefile.am delete mode 100644 src/auditor-lib/backoff.h delete mode 100644 src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv delete mode 100644 src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee delete mode 100644 src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json delete mode 100644 src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json delete mode 100644 src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json delete mode 100644 src/exchange-lib/test_exchange_api_home/.config/taler/test.json delete mode 100644 src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json delete mode 100644 src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv rename src/{exchange-lib => lib}/Makefile.am (69%) rename src/{exchange-lib => lib}/afl-generate.sh (100%) rename src/{auditor-lib/curl_defaults.c => lib/auditor_api_curl_defaults.c} (98%) rename src/{auditor-lib/curl_defaults.h => lib/auditor_api_curl_defaults.h} (100%) rename src/{auditor-lib => lib}/auditor_api_deposit_confirmation.c (99%) rename src/{auditor-lib => lib}/auditor_api_exchanges.c (99%) rename src/{auditor-lib => lib}/auditor_api_handle.c (99%) rename src/{auditor-lib => lib}/auditor_api_handle.h (100%) rename src/{exchange-lib => lib}/backoff.h (100%) rename src/{exchange-lib => lib}/baseline/admin_add_incoming.req (100%) rename src/{exchange-lib => lib}/baseline/deposit.req (100%) rename src/{exchange-lib => lib}/baseline/keys.req (100%) rename src/{exchange-lib => lib}/baseline/refresh_link.req (100%) rename src/{exchange-lib => lib}/baseline/refresh_melt.req (100%) rename src/{exchange-lib => lib}/baseline/refresh_reveal.req (100%) rename src/{exchange-lib => lib}/baseline/reserve_status.req (100%) rename src/{exchange-lib => lib}/baseline/reserve_withdraw.req (100%) rename src/{exchange-lib => lib}/baseline/wire.req (100%) rename src/{exchange-lib => lib}/baseline/wire_sepa.req (100%) rename src/{exchange-lib => lib}/baseline/wire_test.req (100%) rename src/{exchange-lib => lib}/exchange_api_common.c (100%) rename src/{exchange-lib/curl_defaults.c => lib/exchange_api_curl_defaults.c} (96%) rename src/{exchange-lib/curl_defaults.h => lib/exchange_api_curl_defaults.h} (96%) rename src/{exchange-lib => lib}/exchange_api_deposit.c (99%) rename src/{exchange-lib => lib}/exchange_api_handle.c (99%) rename src/{exchange-lib => lib}/exchange_api_handle.h (100%) rename src/{exchange-lib => lib}/exchange_api_payback.c (99%) rename src/{exchange-lib => lib}/exchange_api_refresh.c (99%) rename src/{exchange-lib => lib}/exchange_api_refresh_link.c (99%) rename src/{exchange-lib => lib}/exchange_api_refund.c (99%) rename src/{exchange-lib => lib}/exchange_api_reserve.c (99%) rename src/{exchange-lib => lib}/exchange_api_track_transaction.c (99%) rename src/{exchange-lib => lib}/exchange_api_track_transfer.c (99%) rename src/{exchange-lib => lib}/exchange_api_wire.c (99%) rename src/{auditor-lib => lib}/test_auditor_api.c (100%) rename src/{auditor-lib => lib}/test_auditor_api.conf (100%) rename src/{auditor-lib => lib}/test_auditor_api_expire_reserve_now.conf (100%) rename src/{exchange-lib => lib}/test_exchange_api.conf (100%) rename src/{exchange-lib => lib}/test_exchange_api_expire_reserve_now.conf (100%) rename src/{auditor-lib => lib}/test_exchange_api_home/.config/taler/account-1.json (100%) rename src/{auditor-lib => lib}/test_exchange_api_home/.config/taler/account-2.json (100%) rename src/{auditor-lib => lib}/test_exchange_api_home/.config/taler/sepa.json (100%) rename src/{auditor-lib => lib}/test_exchange_api_home/.config/taler/test.json (100%) rename src/{auditor-lib => lib}/test_exchange_api_home/.config/taler/x-taler-bank.json (100%) rename src/{auditor-lib => lib}/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv (100%) rename src/{exchange-lib => lib}/test_exchange_api_keys_cherry_picking.conf (100%) rename src/{exchange-lib => lib}/test_exchange_api_keys_cherry_picking_extended.conf (100%) rename src/{exchange-lib => lib}/test_exchange_api_keys_cherry_picking_extended_2.conf (100%) rename src/{exchange-lib => lib}/test_exchange_api_keys_cherry_picking_new.c (100%) rename src/{exchange-lib => lib}/test_exchange_api_new.c (100%) rename src/{exchange-lib => lib}/test_exchange_api_overlapping_keys_bug.c (100%) rename src/{exchange-lib => lib}/test_exchange_api_twisted.c (100%) rename src/{exchange-lib => lib}/test_exchange_api_twisted.conf (100%) rename src/{exchange-lib => lib}/testing_api_cmd_bank_check.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_batch.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_check_keys.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_deposit.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_exec_aggregator.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_exec_auditor-sign.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_exec_keyup.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_exec_wirewatch.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_fakebank_transfer.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_payback.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_refresh.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_refund.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_serialize_keys.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_signal.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_sleep.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_status.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_track.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_wire.c (100%) rename src/{exchange-lib => lib}/testing_api_cmd_withdraw.c (100%) rename src/{exchange-lib => lib}/testing_api_helpers.c (100%) rename src/{exchange-lib => lib}/testing_api_loop.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_amount.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_blinding_key.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_cmd.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_coin_priv.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_denom_pub.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_denom_sig.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_exchange_pub.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_exchange_sig.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_fresh_coin.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_json.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_key_peer.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_number.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_process.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_reserve_priv.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_string.c (100%) rename src/{exchange-lib => lib}/testing_api_trait_wtid.c (100%) rename src/{exchange-lib => lib}/testing_api_traits.c (100%) rename src/{auditor-lib => lib}/testing_auditor_api_cmd_deposit_confirmation.c (99%) rename src/{auditor-lib => lib}/testing_auditor_api_cmd_exchanges.c (99%) rename src/{auditor-lib => lib}/testing_auditor_api_cmd_exec_auditor.c (100%) rename src/{auditor-lib => lib}/testing_auditor_api_cmd_exec_auditor_dbinit.c (100%) rename src/{auditor-lib => lib}/testing_auditor_api_cmd_exec_wire_auditor.c (100%) rename src/{auditor-lib => lib}/testing_auditor_api_helpers.c (100%) diff --git a/.gitignore b/.gitignore index f2bb9e368..8e3596100 100644 --- a/.gitignore +++ b/.gitignore @@ -40,14 +40,14 @@ src/bank-lib/test_bank_api_new src/bank-lib/test_bank_api_with_fakebank src/bank-lib/test_bank_api_with_fakebank_new src/bank-lib/test_bank_api_with_fakebank_twisted -src/exchange-lib/test_exchange_api_new -src/exchange-lib/test_exchange_api -src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/live-keys/ -src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/ -src/exchange-lib/test_exchange_api_home/.local/share/taler/auditor/ -src/exchange-lib/test_exchange_api_home/.local/share/taler/auditors/ -src/exchange-lib/auditor.in -src/exchange-lib/test_exchange_api_twisted +src/lib/test_exchange_api_new +src/lib/test_exchange_api +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/lib/auditor.in +src/lib/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/ @@ -97,8 +97,8 @@ doc/manual/manual.tp doc/manual/manual.vr contrib/taler-exchange.tag doxygen-doc/ -src/exchange-lib/test_exchange_api_keys_cherry_picking -src/exchange-lib/test_exchange_api_keys_cherry_picking_new +src/lib/test_exchange_api_keys_cherry_picking +src/lib/test_exchange_api_keys_cherry_picking_new src/auditor/taler-wire-auditor contrib/auditor-report.aux contrib/auditor-report.log @@ -106,4 +106,4 @@ contrib/auditor-report.tex contrib/auditor-report.pdf src/bank-lib/taler-bank-transfer src/bank-lib/test_bank_api_twisted -src/exchange-lib/test_exchange_api_new +src/lib/test_exchange_api_new diff --git a/configure.ac b/configure.ac index ef622faab..ae0dda1a0 100644 --- a/configure.ac +++ b/configure.ac @@ -546,12 +546,11 @@ AC_CONFIG_FILES([Makefile src/Makefile src/auditor/Makefile src/auditordb/Makefile - src/auditor-lib/Makefile src/bank-lib/Makefile src/exchange/Makefile src/exchangedb/Makefile src/exchange-tools/Makefile - src/exchange-lib/Makefile + src/lib/Makefile src/benchmark/Makefile src/include/Makefile src/json/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 8de5e4b87..80fa40dbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,12 +22,12 @@ pkgcfg_DATA = \ EXTRA_DIST = \ taler.conf -SUBDIRS = include util wire json $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor +SUBDIRS = include util wire json $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor if HAVE_LIBCURL - SUBDIRS += exchange-lib auditor-lib benchmark + SUBDIRS += lib benchmark else if HAVE_LIBGNURL - SUBDIRS += exchange-lib auditor-lib benchmark + SUBDIRS += lib benchmark endif endif diff --git a/src/auditor-lib/Makefile.am b/src/auditor-lib/Makefile.am deleted file mode 100644 index 7d16d95b4..000000000 --- a/src/auditor-lib/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -# This Makefile.am is in the public domain -AM_CPPFLAGS = -I$(top_srcdir)/src/include - -if USE_COVERAGE - AM_CFLAGS = --coverage -O0 - XLIB = -lgcov -endif - -lib_LTLIBRARIES = \ - libtalerauditor.la \ - libtalerauditortesting.la - -libtalerauditor_la_LDFLAGS = \ - -version-info 0:0:0 \ - -no-undefined -libtalerauditor_la_SOURCES = \ - curl_defaults.c \ - auditor_api_handle.c auditor_api_handle.h \ - auditor_api_deposit_confirmation.c \ - auditor_api_exchanges.c -libtalerauditor_la_LIBADD = \ - $(top_builddir)/src/json/libtalerjson.la \ - $(top_builddir)/src/util/libtalerutil.la \ - -lgnunetcurl \ - -lgnunetjson \ - -lgnunetutil \ - -ljansson \ - $(XLIB) - -if HAVE_LIBCURL -libtalerauditor_la_LIBADD += -lcurl -else -if HAVE_LIBGNURL -libtalerauditor_la_LIBADD += -lgnurl -endif -endif - - -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 \ - $(top_builddir)/src/exchange-lib/libtalerexchange.la \ - $(top_builddir)/src/exchange-lib/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) - - -check_PROGRAMS = \ - test_auditor_api - -AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH; - -TESTS = \ - $(check_PROGRAMS) - -test_auditor_api_SOURCES = \ - test_auditor_api.c -test_auditor_api_LDADD = \ - libtalerauditortesting.la \ - libtalerauditor.la \ - $(top_builddir)/src/exchange-lib/libtalertesting.la \ - $(top_builddir)/src/exchange-lib/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 - - -EXTRA_DIST = \ - test_auditor_api.conf \ - test_auditor_api_expire_reserve_now.conf diff --git a/src/auditor-lib/backoff.h b/src/auditor-lib/backoff.h deleted file mode 100644 index 523a6b9eb..000000000 --- a/src/auditor-lib/backoff.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014-2018 GNUnet e.V. - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see - -*/ - -/** - * @file auditor-lib/backoff.h - * @brief backoff computation for the auditor lib - * @author Florian Dold - */ - - -#ifndef _TALER_BACKOFF_H -#define _TALER_BACKOFF_H - -#include "platform.h" -#include - -/** - * Random exponential backoff used in the auditor lib. - */ -#define AUDITOR_LIB_BACKOFF(r) GNUNET_TIME_randomized_backoff ( \ - (r), \ - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)); - -#endif diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv b/src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv deleted file mode 100644 index d71a7722c..000000000 --- a/src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv +++ /dev/null @@ -1 +0,0 @@ -~}K+*hm^-{{0Z4 \ No newline at end of file diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee b/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee deleted file mode 100644 index 68f27cad48b7adf8b0da167a88fda387700f4f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmZQzVCZ0AU}5>mIVF8>hhJN}Xyh`jdgW~|%Jy@38JJ5<+$uEZi3_jIKK1pF+b_@7 zd2ur-YOh7B_zCGhy(>RG_;J!*`hV&QrcDg2b&>Hwdl(p4XS2Ufo5KJH{7w$8p+Rsi zoPj2u7Qrg4z4@ck{}9uszE2nYKFN1SZAqw6-SLu>&J*g)>~3oPFM1wwR#qr>>J1aa zH7Bm_ShPI0Aw;76jFVCKcCe{b@(0xYtlLjb4ZH()E(4l-;Sy-#(l>84|GUt?M`LRL z-e`sv#$#ueaJt=+U2*Tbt~jTTr_I4f#cJ+M7V8e#l{@AyJ}9m5{{5b>TyJ8&-wLWw zI<3zGG?z;LfV!XcN~K~dFkWB)&Al*TbpKg(W*-n~5jwgPRQx|GgOSwC?Sv1*>A-zNx+DcwXvM`25x4%eV9d{#kMSI41z(qSzh) diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am index 4ac4efd67..193f539cd 100644 --- a/src/benchmark/Makefile.am +++ b/src/benchmark/Makefile.am @@ -20,8 +20,8 @@ taler_exchange_benchmark_LDADD = \ $(top_builddir)/src/wire/libtalerwire.la \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ - $(top_builddir)/src/exchange-lib/libtalerexchange.la \ - $(top_builddir)/src/exchange-lib/libtalertesting.la \ + $(top_builddir)/src/lib/libtalerexchange.la \ + $(top_builddir)/src/lib/libtalertesting.la \ $(top_builddir)/src/bank-lib/libtalerfakebank.la \ $(top_builddir)/src/bank-lib/libtalerbank.la \ $(top_builddir)/src/bank-lib/libtalerbanktesting.la \ diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json b/src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json deleted file mode 100644 index 48093f2aa..000000000 --- a/src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "url": "payto://sepa/CH9300762011623852957", - "salt": "N83T9J9202WCC8TQFDMJDWEGZNBEKA33C1ZM241VNYH88RZNTHPW509Y1M2YF7Y098R8VRESWQ05H03BK1SPAZCWE54KARDCKT5N8AG", - "master_sig": "D4V5GJ998YK7D6N0N56AD0J6MZNFEW6MRZT2CFPVQ5ME3NMQ59AA2007CXYESSFGRN70CNCFM06858QSSENCWTZM8VHEJ93YQ20ZJ1R" -} \ No newline at end of file diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json b/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json deleted file mode 100644 index 159e03171..000000000 --- a/src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "url": "payto://x-taler-bank/localhost:8082/2", - "master_sig": "HC47BZN3C0KJ2VPMJ5EJWD2FXJ72AET0NWFE6JGSGK5CXS4GSKJJ6Z7BTS56JWM7B40SD61Z5GYYMRRE3X9JTJBVMWE0X7XHNXQ9P38" -} \ No newline at end of file diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json b/src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json deleted file mode 100644 index b435ce86b..000000000 --- a/src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "Max Musterman", - "bic": "COBADEFF370", - "type": "sepa", - "sig": "4EVRC2MCJPXQC8MC00831DNWEXMZAP4JQDDE1A7R6KR3MANG24RC1VQ55AX5A2E35S58VW1VSTENFTPHG5MWG9BSN8B8WXSV21KKW20", - "address": "Musterstadt", - "salt": "3KTM1ZRMWGEQPQ254S4R5R4Q8XM0ZYWTCTE01TZ76MVBSQ6RX7A5DR08WXVH1DCHR1R7ACRB7X0EVC2XDW1CBZM9WFSD9TRMZ90BR98", - "iban": "DE89370400440532013000" -} \ No newline at end of file diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/test.json b/src/exchange-lib/test_exchange_api_home/.config/taler/test.json deleted file mode 100644 index eca394241..000000000 --- a/src/exchange-lib/test_exchange_api_home/.config/taler/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "salt": "AZPRFVJ58NM6M7J5CZQPJAH3EW5DYM52AEZ9Y1C1ER3W94QV8D8TQKF6CK8MYQRA9QMSKDQTGZ306ZS9GQ0M6R01CJ20KPP49WFDZK8", - "name": "The exchange", - "account_number": 3, - "bank_url": "http://localhost:8082/", - "type": "test", - "sig": "RPQXP9S4P8PQP7HEZQNRSZCT0ATNEP8GW0P5TPM34V5RX86FCD670V44R9NETSYDDKB8SZV7TKY9PAJYTY51D3VDWY9XXQ5BPFRXR28" -} diff --git a/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json deleted file mode 100644 index a15df27ca..000000000 --- a/src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "url": "payto://x-taler-bank/http://localhost:8082/2", - "master_sig": "KQ0BWSCNVR7HGGSAMCYK8ZM30RBS1MHMXT3QBN01PZWC9TV72FEE5RJ7T84C8134EPV6WEBXXY2MTFNE8ZXST6JEJQKR8HX6FQPVY10" -} \ No newline at end of file diff --git a/src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv deleted file mode 100644 index 394926938..000000000 --- a/src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv +++ /dev/null @@ -1 +0,0 @@ -p^-33XX!\0qmU_ \ No newline at end of file diff --git a/src/exchange-lib/Makefile.am b/src/lib/Makefile.am similarity index 69% rename from src/exchange-lib/Makefile.am rename to src/lib/Makefile.am index f7fb55f0b..59b1f3165 100644 --- a/src/exchange-lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,13 +8,15 @@ endif lib_LTLIBRARIES = \ libtalerexchange.la \ - libtalertesting.la + libtalertesting.la \ + libtalerauditor.la \ + libtalerauditortesting.la libtalerexchange_la_LDFLAGS = \ -version-info 4:0:0 \ -no-undefined libtalerexchange_la_SOURCES = \ - curl_defaults.c \ + exchange_api_curl_defaults.c exchange_api_curl_defaults.h \ exchange_api_common.c \ exchange_api_handle.c exchange_api_handle.h \ exchange_api_deposit.c \ @@ -27,7 +29,7 @@ libtalerexchange_la_SOURCES = \ exchange_api_track_transfer.c \ exchange_api_wire.c libtalerexchange_la_LIBADD = \ - $(top_builddir)/src/auditor-lib/libtalerauditor.la \ + libtalerauditor.la \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ -lgnunetcurl \ @@ -36,11 +38,38 @@ libtalerexchange_la_LIBADD = \ -ljansson \ $(XLIB) + +libtalerauditor_la_LDFLAGS = \ + -version-info 0:0:0 \ + -no-undefined +libtalerauditor_la_SOURCES = \ + auditor_api_curl_defaults.c auditor_api_curl_defaults.h \ + auditor_api_handle.c auditor_api_handle.h \ + auditor_api_deposit_confirmation.c \ + auditor_api_exchanges.c +libtalerauditor_la_LIBADD = \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -lgnunetcurl \ + -lgnunetjson \ + -lgnunetutil \ + -ljansson \ + $(XLIB) + +if HAVE_LIBCURL +libtalerauditor_la_LIBADD += -lcurl +else +if HAVE_LIBGNURL +libtalerauditor_la_LIBADD += -lgnurl +endif +endif + + libtalertesting_la_LDFLAGS = \ -version-info 0:0:0 \ -no-undefined libtalertesting_la_SOURCES = \ - curl_defaults.c \ + exchange_api_curl_defaults.c \ testing_api_cmd_exec_aggregator.c \ testing_api_cmd_exec_wirewatch.c \ testing_api_cmd_exec_keyup.c \ @@ -92,6 +121,30 @@ 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) + + if HAVE_LIBCURL libtalerexchange_la_LIBADD += -lcurl else @@ -103,7 +156,8 @@ endif check_PROGRAMS = \ test_exchange_api_keys_cherry_picking_new \ test_exchange_api_overlapping_keys_bug \ - test_exchange_api_new + test_exchange_api_new \ + test_auditor_api if HAVE_TWISTER check_PROGRAMS += \ @@ -113,10 +167,10 @@ test_exchange_api_twisted_SOURCES = \ test_exchange_api_twisted.c test_exchange_api_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ - $(top_builddir)/src/exchange-lib/libtalertesting.la \ + libtalertesting.la \ + libtalerexchange.la \ $(top_builddir)/src/bank-lib/libtalerfakebank.la \ $(top_builddir)/src/bank-lib/libtalerbank.la \ - $(top_builddir)/src/exchange-lib/libtalerexchange.la \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ -ltalertwistertesting \ @@ -172,10 +226,30 @@ test_exchange_api_keys_cherry_picking_new_LDADD = \ -lgnunetutil \ -ljansson +test_auditor_api_SOURCES = \ + test_auditor_api.c +test_auditor_api_LDADD = \ + libtalerauditortesting.la \ + 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 + + + EXTRA_DIST = \ test_exchange_api_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_keys_cherry_picking.conf \ - test_exchange_api_keys_cherry_picking_extended.conf + test_exchange_api_keys_cherry_picking_extended.conf \ + test_auditor_api.conf \ + test_auditor_api_expire_reserve_now.conf diff --git a/src/exchange-lib/afl-generate.sh b/src/lib/afl-generate.sh similarity index 100% rename from src/exchange-lib/afl-generate.sh rename to src/lib/afl-generate.sh diff --git a/src/auditor-lib/curl_defaults.c b/src/lib/auditor_api_curl_defaults.c similarity index 98% rename from src/auditor-lib/curl_defaults.c rename to src/lib/auditor_api_curl_defaults.c index 7dadc950e..d5b924008 100644 --- a/src/auditor-lib/curl_defaults.c +++ b/src/lib/auditor_api_curl_defaults.c @@ -20,7 +20,7 @@ * @author Florian Dold */ -#include "curl_defaults.h" +#include "auditor_api_curl_defaults.h" /** diff --git a/src/auditor-lib/curl_defaults.h b/src/lib/auditor_api_curl_defaults.h similarity index 100% rename from src/auditor-lib/curl_defaults.h rename to src/lib/auditor_api_curl_defaults.h diff --git a/src/auditor-lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c similarity index 99% rename from src/auditor-lib/auditor_api_deposit_confirmation.c rename to src/lib/auditor_api_deposit_confirmation.c index 736f326dd..99c855fb4 100644 --- a/src/auditor-lib/auditor_api_deposit_confirmation.c +++ b/src/lib/auditor_api_deposit_confirmation.c @@ -29,7 +29,7 @@ #include "taler_auditor_service.h" #include "auditor_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "auditor_api_curl_defaults.h" /** diff --git a/src/auditor-lib/auditor_api_exchanges.c b/src/lib/auditor_api_exchanges.c similarity index 99% rename from src/auditor-lib/auditor_api_exchanges.c rename to src/lib/auditor_api_exchanges.c index 2ddd2e5bf..770eedda3 100644 --- a/src/auditor-lib/auditor_api_exchanges.c +++ b/src/lib/auditor_api_exchanges.c @@ -29,7 +29,7 @@ #include "taler_auditor_service.h" #include "auditor_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "auditor_api_curl_defaults.h" /** * How many exchanges do we allow a single auditor to diff --git a/src/auditor-lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c similarity index 99% rename from src/auditor-lib/auditor_api_handle.c rename to src/lib/auditor_api_handle.c index 26eca74e6..aca591dc7 100644 --- a/src/auditor-lib/auditor_api_handle.c +++ b/src/lib/auditor_api_handle.c @@ -27,7 +27,7 @@ #include "taler_auditor_service.h" #include "taler_signatures.h" #include "auditor_api_handle.h" -#include "curl_defaults.h" +#include "auditor_api_curl_defaults.h" #include "backoff.h" /** @@ -299,7 +299,7 @@ version_completed_cb (void *cls, free_version_request (vr); auditor->vr = NULL; GNUNET_assert (NULL == auditor->retry_task); - auditor->retry_delay = AUDITOR_LIB_BACKOFF (auditor->retry_delay); + auditor->retry_delay = EXCHANGE_LIB_BACKOFF (auditor->retry_delay); auditor->retry_task = GNUNET_SCHEDULER_add_delayed (auditor->retry_delay, &request_version, auditor); diff --git a/src/auditor-lib/auditor_api_handle.h b/src/lib/auditor_api_handle.h similarity index 100% rename from src/auditor-lib/auditor_api_handle.h rename to src/lib/auditor_api_handle.h diff --git a/src/exchange-lib/backoff.h b/src/lib/backoff.h similarity index 100% rename from src/exchange-lib/backoff.h rename to src/lib/backoff.h diff --git a/src/exchange-lib/baseline/admin_add_incoming.req b/src/lib/baseline/admin_add_incoming.req similarity index 100% rename from src/exchange-lib/baseline/admin_add_incoming.req rename to src/lib/baseline/admin_add_incoming.req diff --git a/src/exchange-lib/baseline/deposit.req b/src/lib/baseline/deposit.req similarity index 100% rename from src/exchange-lib/baseline/deposit.req rename to src/lib/baseline/deposit.req diff --git a/src/exchange-lib/baseline/keys.req b/src/lib/baseline/keys.req similarity index 100% rename from src/exchange-lib/baseline/keys.req rename to src/lib/baseline/keys.req diff --git a/src/exchange-lib/baseline/refresh_link.req b/src/lib/baseline/refresh_link.req similarity index 100% rename from src/exchange-lib/baseline/refresh_link.req rename to src/lib/baseline/refresh_link.req diff --git a/src/exchange-lib/baseline/refresh_melt.req b/src/lib/baseline/refresh_melt.req similarity index 100% rename from src/exchange-lib/baseline/refresh_melt.req rename to src/lib/baseline/refresh_melt.req diff --git a/src/exchange-lib/baseline/refresh_reveal.req b/src/lib/baseline/refresh_reveal.req similarity index 100% rename from src/exchange-lib/baseline/refresh_reveal.req rename to src/lib/baseline/refresh_reveal.req diff --git a/src/exchange-lib/baseline/reserve_status.req b/src/lib/baseline/reserve_status.req similarity index 100% rename from src/exchange-lib/baseline/reserve_status.req rename to src/lib/baseline/reserve_status.req diff --git a/src/exchange-lib/baseline/reserve_withdraw.req b/src/lib/baseline/reserve_withdraw.req similarity index 100% rename from src/exchange-lib/baseline/reserve_withdraw.req rename to src/lib/baseline/reserve_withdraw.req diff --git a/src/exchange-lib/baseline/wire.req b/src/lib/baseline/wire.req similarity index 100% rename from src/exchange-lib/baseline/wire.req rename to src/lib/baseline/wire.req diff --git a/src/exchange-lib/baseline/wire_sepa.req b/src/lib/baseline/wire_sepa.req similarity index 100% rename from src/exchange-lib/baseline/wire_sepa.req rename to src/lib/baseline/wire_sepa.req diff --git a/src/exchange-lib/baseline/wire_test.req b/src/lib/baseline/wire_test.req similarity index 100% rename from src/exchange-lib/baseline/wire_test.req rename to src/lib/baseline/wire_test.req diff --git a/src/exchange-lib/exchange_api_common.c b/src/lib/exchange_api_common.c similarity index 100% rename from src/exchange-lib/exchange_api_common.c rename to src/lib/exchange_api_common.c diff --git a/src/exchange-lib/curl_defaults.c b/src/lib/exchange_api_curl_defaults.c similarity index 96% rename from src/exchange-lib/curl_defaults.c rename to src/lib/exchange_api_curl_defaults.c index cd0f1aeba..45aa36b9f 100644 --- a/src/exchange-lib/curl_defaults.c +++ b/src/lib/exchange_api_curl_defaults.c @@ -15,12 +15,12 @@ */ /** - * @file exchange-lib/curl_defaults.c + * @file lib/exchange_api_curl_defaults.c * @brief curl easy handle defaults * @author Florian Dold */ -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** diff --git a/src/exchange-lib/curl_defaults.h b/src/lib/exchange_api_curl_defaults.h similarity index 96% rename from src/exchange-lib/curl_defaults.h rename to src/lib/exchange_api_curl_defaults.h index 07bab8fb2..7ebf4e966 100644 --- a/src/exchange-lib/curl_defaults.h +++ b/src/lib/exchange_api_curl_defaults.h @@ -16,7 +16,7 @@ */ /** - * @file exchange-lib/curl_defaults.h + * @file lib/exchange_api_curl_defaults.h * @brief curl easy handle defaults * @author Florian Dold */ diff --git a/src/exchange-lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c similarity index 99% rename from src/exchange-lib/exchange_api_deposit.c rename to src/lib/exchange_api_deposit.c index 23066c7dc..55b3ca6b3 100644 --- a/src/exchange-lib/exchange_api_deposit.c +++ b/src/lib/exchange_api_deposit.c @@ -31,7 +31,7 @@ #include "taler_exchange_service.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** @@ -84,7 +84,7 @@ struct TALER_EXCHANGE_DepositHandle * Total value of the coin being transacted with. */ struct TALER_Amount coin_value; - + }; @@ -160,7 +160,7 @@ verify_deposit_signature_ok (const struct TALER_EXCHANGE_DepositHandle *dh, struct TALER_AUDITOR_DepositConfirmationHandle *dch; const struct TALER_EXCHANGE_SigningPublicKey *spk; struct TALER_Amount amount_without_fee; - + spk = TALER_EXCHANGE_get_signing_key_details (key_state, exchange_pub); GNUNET_assert (NULL != spk); @@ -185,7 +185,7 @@ verify_deposit_signature_ok (const struct TALER_EXCHANGE_DepositHandle *dh, NULL /* FIXME: context! */); } - + return GNUNET_OK; } diff --git a/src/exchange-lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c similarity index 99% rename from src/exchange-lib/exchange_api_handle.c rename to src/lib/exchange_api_handle.c index afaabd85b..9743b1f09 100644 --- a/src/exchange-lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -31,7 +31,7 @@ #include "taler_auditor_service.h" #include "taler_signatures.h" #include "exchange_api_handle.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" #include "backoff.h" /** @@ -100,7 +100,7 @@ struct AuditorInteractionEntry * DLL entry. */ struct AuditorInteractionEntry *next; - + /** * DLL entry. */ @@ -142,7 +142,7 @@ struct AuditorListEntry * Head of DLL of interactions with this auditor. */ struct AuditorInteractionEntry *ai_head; - + /** * Tail of DLL of interactions with this auditor. */ @@ -158,7 +158,7 @@ struct AuditorListEntry * version compatibility is given. */ int is_up; - + }; @@ -214,7 +214,7 @@ struct TALER_EXCHANGE_Handle * Tail of DLL of auditors of this exchange. */ struct AuditorListEntry *auditors_tail; - + /** * Key data of the exchange, only valid if * @e handshake_complete is past stage #MHS_CERT. @@ -234,8 +234,8 @@ struct TALER_EXCHANGE_Handle /** * Stage of the exchange's initialization routines. */ - enum ExchangeHandleState state; - + enum ExchangeHandleState state; + }; @@ -559,7 +559,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor, } if (NULL == dk) { - GNUNET_break_op (0); + GNUNET_break_op (0); continue; } if (check_sigs) @@ -770,7 +770,7 @@ decode_keys_json (const json_t *resp_obj, /* Update "last_denom_issue_date" */ TALER_LOG_DEBUG ("Crawling DK 'valid_from': %s\n", - GNUNET_STRINGS_absolute_time_to_string (dk.valid_from)); + GNUNET_STRINGS_absolute_time_to_string (dk.valid_from)); key_data->last_denom_issue_date = GNUNET_TIME_absolute_max (key_data->last_denom_issue_date, dk.valid_from); @@ -1655,7 +1655,7 @@ TALER_EXCHANGE_get_signing_key_details (const struct TALER_EXCHANGE_Keys *keys, for (unsigned int i=0;inum_sign_keys;i++) { struct TALER_EXCHANGE_SigningPublicKey *spk = &keys->sign_keys[i]; - + if (0 == memcmp (pub, &spk->key, sizeof (struct TALER_ExchangePublicKeyP))) diff --git a/src/exchange-lib/exchange_api_handle.h b/src/lib/exchange_api_handle.h similarity index 100% rename from src/exchange-lib/exchange_api_handle.h rename to src/lib/exchange_api_handle.h diff --git a/src/exchange-lib/exchange_api_payback.c b/src/lib/exchange_api_payback.c similarity index 99% rename from src/exchange-lib/exchange_api_payback.c rename to src/lib/exchange_api_payback.c index 9f8005558..6c1772aff 100644 --- a/src/exchange-lib/exchange_api_payback.c +++ b/src/lib/exchange_api_payback.c @@ -29,7 +29,7 @@ #include "taler_exchange_service.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/lib/exchange_api_refresh.c similarity index 99% rename from src/exchange-lib/exchange_api_refresh.c rename to src/lib/exchange_api_refresh.c index 50c55835b..b766b7957 100644 --- a/src/exchange-lib/exchange_api_refresh.c +++ b/src/lib/exchange_api_refresh.c @@ -29,7 +29,7 @@ #include "taler_exchange_service.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /* ********************* /refresh/ common ***************************** */ diff --git a/src/exchange-lib/exchange_api_refresh_link.c b/src/lib/exchange_api_refresh_link.c similarity index 99% rename from src/exchange-lib/exchange_api_refresh_link.c rename to src/lib/exchange_api_refresh_link.c index 796608db5..ea82c9baa 100644 --- a/src/exchange-lib/exchange_api_refresh_link.c +++ b/src/lib/exchange_api_refresh_link.c @@ -27,7 +27,7 @@ #include "taler_json_lib.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** diff --git a/src/exchange-lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c similarity index 99% rename from src/exchange-lib/exchange_api_refund.c rename to src/lib/exchange_api_refund.c index 447e9ce08..75ebdc4e3 100644 --- a/src/exchange-lib/exchange_api_refund.c +++ b/src/lib/exchange_api_refund.c @@ -29,7 +29,7 @@ #include "taler_exchange_service.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** @@ -284,7 +284,7 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, cb_cls); } - + /** * Submit a refund request to the exchange and get the exchange's * response. This API is used by a merchant. Note that diff --git a/src/exchange-lib/exchange_api_reserve.c b/src/lib/exchange_api_reserve.c similarity index 99% rename from src/exchange-lib/exchange_api_reserve.c rename to src/lib/exchange_api_reserve.c index aa153f210..d4d0cb9a1 100644 --- a/src/exchange-lib/exchange_api_reserve.c +++ b/src/lib/exchange_api_reserve.c @@ -29,7 +29,7 @@ #include "taler_json_lib.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /* ********************** /reserve/status ********************** */ diff --git a/src/exchange-lib/exchange_api_track_transaction.c b/src/lib/exchange_api_track_transaction.c similarity index 99% rename from src/exchange-lib/exchange_api_track_transaction.c rename to src/lib/exchange_api_track_transaction.c index d61344e59..0942ce84a 100644 --- a/src/exchange-lib/exchange_api_track_transaction.c +++ b/src/lib/exchange_api_track_transaction.c @@ -29,7 +29,7 @@ #include "taler_exchange_service.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** diff --git a/src/exchange-lib/exchange_api_track_transfer.c b/src/lib/exchange_api_track_transfer.c similarity index 99% rename from src/exchange-lib/exchange_api_track_transfer.c rename to src/lib/exchange_api_track_transfer.c index cf87fe77a..88043b7ba 100644 --- a/src/exchange-lib/exchange_api_track_transfer.c +++ b/src/lib/exchange_api_track_transfer.c @@ -28,7 +28,7 @@ #include "taler_json_lib.h" #include "exchange_api_handle.h" #include "taler_signatures.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** diff --git a/src/exchange-lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c similarity index 99% rename from src/exchange-lib/exchange_api_wire.c rename to src/lib/exchange_api_wire.c index 0d4644dbf..85d1835cf 100644 --- a/src/exchange-lib/exchange_api_wire.c +++ b/src/lib/exchange_api_wire.c @@ -30,7 +30,7 @@ #include "taler_signatures.h" #include "taler_wire_plugin.h" #include "exchange_api_handle.h" -#include "curl_defaults.h" +#include "exchange_api_curl_defaults.h" /** diff --git a/src/auditor-lib/test_auditor_api.c b/src/lib/test_auditor_api.c similarity index 100% rename from src/auditor-lib/test_auditor_api.c rename to src/lib/test_auditor_api.c diff --git a/src/auditor-lib/test_auditor_api.conf b/src/lib/test_auditor_api.conf similarity index 100% rename from src/auditor-lib/test_auditor_api.conf rename to src/lib/test_auditor_api.conf diff --git a/src/auditor-lib/test_auditor_api_expire_reserve_now.conf b/src/lib/test_auditor_api_expire_reserve_now.conf similarity index 100% rename from src/auditor-lib/test_auditor_api_expire_reserve_now.conf rename to src/lib/test_auditor_api_expire_reserve_now.conf diff --git a/src/exchange-lib/test_exchange_api.conf b/src/lib/test_exchange_api.conf similarity index 100% rename from src/exchange-lib/test_exchange_api.conf rename to src/lib/test_exchange_api.conf diff --git a/src/exchange-lib/test_exchange_api_expire_reserve_now.conf b/src/lib/test_exchange_api_expire_reserve_now.conf similarity index 100% rename from src/exchange-lib/test_exchange_api_expire_reserve_now.conf rename to src/lib/test_exchange_api_expire_reserve_now.conf diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/account-1.json b/src/lib/test_exchange_api_home/.config/taler/account-1.json similarity index 100% rename from src/auditor-lib/test_exchange_api_home/.config/taler/account-1.json rename to src/lib/test_exchange_api_home/.config/taler/account-1.json diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/account-2.json b/src/lib/test_exchange_api_home/.config/taler/account-2.json similarity index 100% rename from src/auditor-lib/test_exchange_api_home/.config/taler/account-2.json rename to src/lib/test_exchange_api_home/.config/taler/account-2.json diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/sepa.json b/src/lib/test_exchange_api_home/.config/taler/sepa.json similarity index 100% rename from src/auditor-lib/test_exchange_api_home/.config/taler/sepa.json rename to src/lib/test_exchange_api_home/.config/taler/sepa.json diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/test.json b/src/lib/test_exchange_api_home/.config/taler/test.json similarity index 100% rename from src/auditor-lib/test_exchange_api_home/.config/taler/test.json rename to src/lib/test_exchange_api_home/.config/taler/test.json diff --git a/src/auditor-lib/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json similarity index 100% rename from src/auditor-lib/test_exchange_api_home/.config/taler/x-taler-bank.json rename to src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv similarity index 100% rename from src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv rename to src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf b/src/lib/test_exchange_api_keys_cherry_picking.conf similarity index 100% rename from src/exchange-lib/test_exchange_api_keys_cherry_picking.conf rename to src/lib/test_exchange_api_keys_cherry_picking.conf diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended.conf b/src/lib/test_exchange_api_keys_cherry_picking_extended.conf similarity index 100% rename from src/exchange-lib/test_exchange_api_keys_cherry_picking_extended.conf rename to src/lib/test_exchange_api_keys_cherry_picking_extended.conf diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf b/src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf similarity index 100% rename from src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf rename to src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c b/src/lib/test_exchange_api_keys_cherry_picking_new.c similarity index 100% rename from src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c rename to src/lib/test_exchange_api_keys_cherry_picking_new.c diff --git a/src/exchange-lib/test_exchange_api_new.c b/src/lib/test_exchange_api_new.c similarity index 100% rename from src/exchange-lib/test_exchange_api_new.c rename to src/lib/test_exchange_api_new.c diff --git a/src/exchange-lib/test_exchange_api_overlapping_keys_bug.c b/src/lib/test_exchange_api_overlapping_keys_bug.c similarity index 100% rename from src/exchange-lib/test_exchange_api_overlapping_keys_bug.c rename to src/lib/test_exchange_api_overlapping_keys_bug.c diff --git a/src/exchange-lib/test_exchange_api_twisted.c b/src/lib/test_exchange_api_twisted.c similarity index 100% rename from src/exchange-lib/test_exchange_api_twisted.c rename to src/lib/test_exchange_api_twisted.c diff --git a/src/exchange-lib/test_exchange_api_twisted.conf b/src/lib/test_exchange_api_twisted.conf similarity index 100% rename from src/exchange-lib/test_exchange_api_twisted.conf rename to src/lib/test_exchange_api_twisted.conf diff --git a/src/exchange-lib/testing_api_cmd_bank_check.c b/src/lib/testing_api_cmd_bank_check.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_bank_check.c rename to src/lib/testing_api_cmd_bank_check.c diff --git a/src/exchange-lib/testing_api_cmd_batch.c b/src/lib/testing_api_cmd_batch.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_batch.c rename to src/lib/testing_api_cmd_batch.c diff --git a/src/exchange-lib/testing_api_cmd_check_keys.c b/src/lib/testing_api_cmd_check_keys.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_check_keys.c rename to src/lib/testing_api_cmd_check_keys.c diff --git a/src/exchange-lib/testing_api_cmd_deposit.c b/src/lib/testing_api_cmd_deposit.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_deposit.c rename to src/lib/testing_api_cmd_deposit.c diff --git a/src/exchange-lib/testing_api_cmd_exec_aggregator.c b/src/lib/testing_api_cmd_exec_aggregator.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_exec_aggregator.c rename to src/lib/testing_api_cmd_exec_aggregator.c diff --git a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c b/src/lib/testing_api_cmd_exec_auditor-sign.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_exec_auditor-sign.c rename to src/lib/testing_api_cmd_exec_auditor-sign.c diff --git a/src/exchange-lib/testing_api_cmd_exec_keyup.c b/src/lib/testing_api_cmd_exec_keyup.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_exec_keyup.c rename to src/lib/testing_api_cmd_exec_keyup.c diff --git a/src/exchange-lib/testing_api_cmd_exec_wirewatch.c b/src/lib/testing_api_cmd_exec_wirewatch.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_exec_wirewatch.c rename to src/lib/testing_api_cmd_exec_wirewatch.c diff --git a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c b/src/lib/testing_api_cmd_fakebank_transfer.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_fakebank_transfer.c rename to src/lib/testing_api_cmd_fakebank_transfer.c diff --git a/src/exchange-lib/testing_api_cmd_payback.c b/src/lib/testing_api_cmd_payback.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_payback.c rename to src/lib/testing_api_cmd_payback.c diff --git a/src/exchange-lib/testing_api_cmd_refresh.c b/src/lib/testing_api_cmd_refresh.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_refresh.c rename to src/lib/testing_api_cmd_refresh.c diff --git a/src/exchange-lib/testing_api_cmd_refund.c b/src/lib/testing_api_cmd_refund.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_refund.c rename to src/lib/testing_api_cmd_refund.c diff --git a/src/exchange-lib/testing_api_cmd_serialize_keys.c b/src/lib/testing_api_cmd_serialize_keys.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_serialize_keys.c rename to src/lib/testing_api_cmd_serialize_keys.c diff --git a/src/exchange-lib/testing_api_cmd_signal.c b/src/lib/testing_api_cmd_signal.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_signal.c rename to src/lib/testing_api_cmd_signal.c diff --git a/src/exchange-lib/testing_api_cmd_sleep.c b/src/lib/testing_api_cmd_sleep.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_sleep.c rename to src/lib/testing_api_cmd_sleep.c diff --git a/src/exchange-lib/testing_api_cmd_status.c b/src/lib/testing_api_cmd_status.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_status.c rename to src/lib/testing_api_cmd_status.c diff --git a/src/exchange-lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_track.c rename to src/lib/testing_api_cmd_track.c diff --git a/src/exchange-lib/testing_api_cmd_wire.c b/src/lib/testing_api_cmd_wire.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_wire.c rename to src/lib/testing_api_cmd_wire.c diff --git a/src/exchange-lib/testing_api_cmd_withdraw.c b/src/lib/testing_api_cmd_withdraw.c similarity index 100% rename from src/exchange-lib/testing_api_cmd_withdraw.c rename to src/lib/testing_api_cmd_withdraw.c diff --git a/src/exchange-lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c similarity index 100% rename from src/exchange-lib/testing_api_helpers.c rename to src/lib/testing_api_helpers.c diff --git a/src/exchange-lib/testing_api_loop.c b/src/lib/testing_api_loop.c similarity index 100% rename from src/exchange-lib/testing_api_loop.c rename to src/lib/testing_api_loop.c diff --git a/src/exchange-lib/testing_api_trait_amount.c b/src/lib/testing_api_trait_amount.c similarity index 100% rename from src/exchange-lib/testing_api_trait_amount.c rename to src/lib/testing_api_trait_amount.c diff --git a/src/exchange-lib/testing_api_trait_blinding_key.c b/src/lib/testing_api_trait_blinding_key.c similarity index 100% rename from src/exchange-lib/testing_api_trait_blinding_key.c rename to src/lib/testing_api_trait_blinding_key.c diff --git a/src/exchange-lib/testing_api_trait_cmd.c b/src/lib/testing_api_trait_cmd.c similarity index 100% rename from src/exchange-lib/testing_api_trait_cmd.c rename to src/lib/testing_api_trait_cmd.c diff --git a/src/exchange-lib/testing_api_trait_coin_priv.c b/src/lib/testing_api_trait_coin_priv.c similarity index 100% rename from src/exchange-lib/testing_api_trait_coin_priv.c rename to src/lib/testing_api_trait_coin_priv.c diff --git a/src/exchange-lib/testing_api_trait_denom_pub.c b/src/lib/testing_api_trait_denom_pub.c similarity index 100% rename from src/exchange-lib/testing_api_trait_denom_pub.c rename to src/lib/testing_api_trait_denom_pub.c diff --git a/src/exchange-lib/testing_api_trait_denom_sig.c b/src/lib/testing_api_trait_denom_sig.c similarity index 100% rename from src/exchange-lib/testing_api_trait_denom_sig.c rename to src/lib/testing_api_trait_denom_sig.c diff --git a/src/exchange-lib/testing_api_trait_exchange_pub.c b/src/lib/testing_api_trait_exchange_pub.c similarity index 100% rename from src/exchange-lib/testing_api_trait_exchange_pub.c rename to src/lib/testing_api_trait_exchange_pub.c diff --git a/src/exchange-lib/testing_api_trait_exchange_sig.c b/src/lib/testing_api_trait_exchange_sig.c similarity index 100% rename from src/exchange-lib/testing_api_trait_exchange_sig.c rename to src/lib/testing_api_trait_exchange_sig.c diff --git a/src/exchange-lib/testing_api_trait_fresh_coin.c b/src/lib/testing_api_trait_fresh_coin.c similarity index 100% rename from src/exchange-lib/testing_api_trait_fresh_coin.c rename to src/lib/testing_api_trait_fresh_coin.c diff --git a/src/exchange-lib/testing_api_trait_json.c b/src/lib/testing_api_trait_json.c similarity index 100% rename from src/exchange-lib/testing_api_trait_json.c rename to src/lib/testing_api_trait_json.c diff --git a/src/exchange-lib/testing_api_trait_key_peer.c b/src/lib/testing_api_trait_key_peer.c similarity index 100% rename from src/exchange-lib/testing_api_trait_key_peer.c rename to src/lib/testing_api_trait_key_peer.c diff --git a/src/exchange-lib/testing_api_trait_number.c b/src/lib/testing_api_trait_number.c similarity index 100% rename from src/exchange-lib/testing_api_trait_number.c rename to src/lib/testing_api_trait_number.c diff --git a/src/exchange-lib/testing_api_trait_process.c b/src/lib/testing_api_trait_process.c similarity index 100% rename from src/exchange-lib/testing_api_trait_process.c rename to src/lib/testing_api_trait_process.c diff --git a/src/exchange-lib/testing_api_trait_reserve_priv.c b/src/lib/testing_api_trait_reserve_priv.c similarity index 100% rename from src/exchange-lib/testing_api_trait_reserve_priv.c rename to src/lib/testing_api_trait_reserve_priv.c diff --git a/src/exchange-lib/testing_api_trait_string.c b/src/lib/testing_api_trait_string.c similarity index 100% rename from src/exchange-lib/testing_api_trait_string.c rename to src/lib/testing_api_trait_string.c diff --git a/src/exchange-lib/testing_api_trait_wtid.c b/src/lib/testing_api_trait_wtid.c similarity index 100% rename from src/exchange-lib/testing_api_trait_wtid.c rename to src/lib/testing_api_trait_wtid.c diff --git a/src/exchange-lib/testing_api_traits.c b/src/lib/testing_api_traits.c similarity index 100% rename from src/exchange-lib/testing_api_traits.c rename to src/lib/testing_api_traits.c diff --git a/src/auditor-lib/testing_auditor_api_cmd_deposit_confirmation.c b/src/lib/testing_auditor_api_cmd_deposit_confirmation.c similarity index 99% rename from src/auditor-lib/testing_auditor_api_cmd_deposit_confirmation.c rename to src/lib/testing_auditor_api_cmd_deposit_confirmation.c index 6a6e98571..ad02a6ef5 100644 --- a/src/auditor-lib/testing_auditor_api_cmd_deposit_confirmation.c +++ b/src/lib/testing_auditor_api_cmd_deposit_confirmation.c @@ -156,7 +156,7 @@ deposit_confirmation_cb (void *cls, if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) dcs->backoff = GNUNET_TIME_UNIT_ZERO; else - dcs->backoff = AUDITOR_LIB_BACKOFF (dcs->backoff); + dcs->backoff = EXCHANGE_LIB_BACKOFF (dcs->backoff); dcs->retry_task = GNUNET_SCHEDULER_add_delayed (dcs->backoff, &do_retry, dcs); diff --git a/src/auditor-lib/testing_auditor_api_cmd_exchanges.c b/src/lib/testing_auditor_api_cmd_exchanges.c similarity index 99% rename from src/auditor-lib/testing_auditor_api_cmd_exchanges.c rename to src/lib/testing_auditor_api_cmd_exchanges.c index 71b82a39a..ed4ca5e0e 100644 --- a/src/auditor-lib/testing_auditor_api_cmd_exchanges.c +++ b/src/lib/testing_auditor_api_cmd_exchanges.c @@ -45,7 +45,7 @@ struct ExchangesState * Auditor connection. */ struct TALER_AUDITOR_Handle *auditor; - + /** * Interpreter state. */ @@ -139,7 +139,7 @@ exchanges_cb (void *cls, if (TALER_EC_DB_COMMIT_FAILED_ON_RETRY == ec) es->backoff = GNUNET_TIME_UNIT_ZERO; else - es->backoff = AUDITOR_LIB_BACKOFF (es->backoff); + es->backoff = EXCHANGE_LIB_BACKOFF (es->backoff); es->retry_task = GNUNET_SCHEDULER_add_delayed (es->backoff, &do_retry, es); @@ -173,7 +173,7 @@ exchanges_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct ExchangesState *es = cls; - + es->is = is; es->leh = TALER_AUDITOR_list_exchanges (es->auditor, @@ -269,7 +269,7 @@ TALER_TESTING_cmd_exchanges cmd.run = &exchanges_run; cmd.cleanup = &exchanges_cleanup; cmd.traits = &exchanges_traits; - + return cmd; } diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor.c b/src/lib/testing_auditor_api_cmd_exec_auditor.c similarity index 100% rename from src/auditor-lib/testing_auditor_api_cmd_exec_auditor.c rename to src/lib/testing_auditor_api_cmd_exec_auditor.c diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c b/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c similarity index 100% rename from src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c rename to src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c diff --git a/src/auditor-lib/testing_auditor_api_cmd_exec_wire_auditor.c b/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c similarity index 100% rename from src/auditor-lib/testing_auditor_api_cmd_exec_wire_auditor.c rename to src/lib/testing_auditor_api_cmd_exec_wire_auditor.c diff --git a/src/auditor-lib/testing_auditor_api_helpers.c b/src/lib/testing_auditor_api_helpers.c similarity index 100% rename from src/auditor-lib/testing_auditor_api_helpers.c rename to src/lib/testing_auditor_api_helpers.c