fix cyclic dependency by combining exchange-lib and auditor-lib directories

.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

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

src/Makefile.am

@@ -24,10 +24,10 @@ EXTRA_DIST = \
 
 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
 

src/auditor-lib/Makefile.am

@@ -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

src/auditor-lib/backoff.h

@@ -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
-  <http://www.gnu.org/licenses/>
-*/
-
-/**
- * @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 <gnunet/gnunet_time_lib.h>
-
-/**
- * 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

src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv

@@ -1 +0,0 @@
-~<7E>}K<>+*hm<68><0E>^<5E>-<2D><>{<7B><1F>{<7B><>0<EFBFBD>Z4<5A>

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 \

src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json

@@ -1,5 +0,0 @@
-{
-  "url": "payto://sepa/CH9300762011623852957",
-  "salt": "N83T9J9202WCC8TQFDMJDWEGZNBEKA33C1ZM241VNYH88RZNTHPW509Y1M2YF7Y098R8VRESWQ05H03BK1SPAZCWE54KARDCKT5N8AG",
-  "master_sig": "D4V5GJ998YK7D6N0N56AD0J6MZNFEW6MRZT2CFPVQ5ME3NMQ59AA2007CXYESSFGRN70CNCFM06858QSSENCWTZM8VHEJ93YQ20ZJ1R"
-}

src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json

@@ -1,4 +0,0 @@
-{
-  "url": "payto://x-taler-bank/localhost:8082/2",
-  "master_sig": "HC47BZN3C0KJ2VPMJ5EJWD2FXJ72AET0NWFE6JGSGK5CXS4GSKJJ6Z7BTS56JWM7B40SD61Z5GYYMRRE3X9JTJBVMWE0X7XHNXQ9P38"
-}

src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json

@@ -1,9 +0,0 @@
-{
-  "name": "Max Musterman",
-  "bic": "COBADEFF370",
-  "type": "sepa",
-  "sig": "4EVRC2MCJPXQC8MC00831DNWEXMZAP4JQDDE1A7R6KR3MANG24RC1VQ55AX5A2E35S58VW1VSTENFTPHG5MWG9BSN8B8WXSV21KKW20",
-  "address": "Musterstadt",
-  "salt": "3KTM1ZRMWGEQPQ254S4R5R4Q8XM0ZYWTCTE01TZ76MVBSQ6RX7A5DR08WXVH1DCHR1R7ACRB7X0EVC2XDW1CBZM9WFSD9TRMZ90BR98",
-  "iban": "DE89370400440532013000"
-}

src/exchange-lib/test_exchange_api_home/.config/taler/test.json

@@ -1,8 +0,0 @@
-{
-  "salt": "AZPRFVJ58NM6M7J5CZQPJAH3EW5DYM52AEZ9Y1C1ER3W94QV8D8TQKF6CK8MYQRA9QMSKDQTGZ306ZS9GQ0M6R01CJ20KPP49WFDZK8",
-  "name": "The exchange",
-  "account_number": 3,
-  "bank_url": "http://localhost:8082/",
-  "type": "test",
-  "sig": "RPQXP9S4P8PQP7HEZQNRSZCT0ATNEP8GW0P5TPM34V5RX86FCD670V44R9NETSYDDKB8SZV7TKY9PAJYTY51D3VDWY9XXQ5BPFRXR28"
-}

src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json

@@ -1,4 +0,0 @@
-{
-  "url": "payto://x-taler-bank/http://localhost:8082/2",
-  "master_sig": "KQ0BWSCNVR7HGGSAMCYK8ZM30RBS1MHMXT3QBN01PZWC9TV72FEE5RJ7T84C8134EPV6WEBXXY2MTFNE8ZXST6JEJQKR8HX6FQPVY10"
-}

src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv

@@ -1 +0,0 @@
-p<EFBFBD>^<5E>-<2D>33<33><33>X
X<>!<04>\0q<30><71><EFBFBD><EFBFBD><18>mU<6D>_<EFBFBD><5F>

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

src/lib/auditor_api_curl_defaults.c

@@ -20,7 +20,7 @@
  * @author Florian Dold
  */
 
-#include "curl_defaults.h"
+#include "auditor_api_curl_defaults.h"
 
 
 /**

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"
 
 
 /**

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

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);

src/lib/exchange_api_curl_defaults.c

@@ -15,12 +15,12 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @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"
 
 
 /**

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
  */

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"
 
 
 /**

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"
 
 /**

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"
 
 
 /**

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 ***************************** */

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"
 
 
 /**

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"
 
 
 /**

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 ********************** */

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"
 
 
 /**

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"
 
 
 /**

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"
 
 
 /**