summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-01-11 21:27:34 +0100
committerChristian Grothoff <christian@grothoff.org>2019-01-11 21:43:15 +0100
commit54fc83ee6b910d482948c6ec8185df7aab1b0cb1 (patch)
tree10c04cad1392659a9ccef469271f866e393ebb48 /src
parent57ab9f9fdba607fcc3817adf58f37c5390f8d220 (diff)
downloadexchange-54fc83ee6b910d482948c6ec8185df7aab1b0cb1.tar.gz
exchange-54fc83ee6b910d482948c6ec8185df7aab1b0cb1.tar.bz2
exchange-54fc83ee6b910d482948c6ec8185df7aab1b0cb1.zip
fix cyclic dependency by combining exchange-lib and auditor-lib directories
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/auditor-lib/Makefile.am90
-rw-r--r--src/auditor-lib/backoff.h38
-rw-r--r--src/auditor-lib/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv1
-rw-r--r--src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.feebin600 -> 0 bytes
-rw-r--r--src/benchmark/Makefile.am4
-rw-r--r--src/exchange-lib/test_exchange_api_home/.config/taler/account-1.json5
-rw-r--r--src/exchange-lib/test_exchange_api_home/.config/taler/account-2.json4
-rw-r--r--src/exchange-lib/test_exchange_api_home/.config/taler/sepa.json9
-rw-r--r--src/exchange-lib/test_exchange_api_home/.config/taler/test.json8
-rw-r--r--src/exchange-lib/test_exchange_api_home/.config/taler/x-taler-bank.json4
-rw-r--r--src/exchange-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv1
-rw-r--r--src/lib/Makefile.am (renamed from src/exchange-lib/Makefile.am)90
-rw-r--r--src/lib/afl-generate.sh (renamed from src/exchange-lib/afl-generate.sh)0
-rw-r--r--src/lib/auditor_api_curl_defaults.c (renamed from src/auditor-lib/curl_defaults.c)2
-rw-r--r--src/lib/auditor_api_curl_defaults.h (renamed from src/auditor-lib/curl_defaults.h)0
-rw-r--r--src/lib/auditor_api_deposit_confirmation.c (renamed from src/auditor-lib/auditor_api_deposit_confirmation.c)2
-rw-r--r--src/lib/auditor_api_exchanges.c (renamed from src/auditor-lib/auditor_api_exchanges.c)2
-rw-r--r--src/lib/auditor_api_handle.c (renamed from src/auditor-lib/auditor_api_handle.c)4
-rw-r--r--src/lib/auditor_api_handle.h (renamed from src/auditor-lib/auditor_api_handle.h)0
-rw-r--r--src/lib/backoff.h (renamed from src/exchange-lib/backoff.h)0
-rw-r--r--src/lib/baseline/admin_add_incoming.req (renamed from src/exchange-lib/baseline/admin_add_incoming.req)0
-rw-r--r--src/lib/baseline/deposit.req (renamed from src/exchange-lib/baseline/deposit.req)0
-rw-r--r--src/lib/baseline/keys.req (renamed from src/exchange-lib/baseline/keys.req)0
-rw-r--r--src/lib/baseline/refresh_link.req (renamed from src/exchange-lib/baseline/refresh_link.req)0
-rw-r--r--src/lib/baseline/refresh_melt.req (renamed from src/exchange-lib/baseline/refresh_melt.req)0
-rw-r--r--src/lib/baseline/refresh_reveal.req (renamed from src/exchange-lib/baseline/refresh_reveal.req)0
-rw-r--r--src/lib/baseline/reserve_status.req (renamed from src/exchange-lib/baseline/reserve_status.req)0
-rw-r--r--src/lib/baseline/reserve_withdraw.req (renamed from src/exchange-lib/baseline/reserve_withdraw.req)0
-rw-r--r--src/lib/baseline/wire.req (renamed from src/exchange-lib/baseline/wire.req)0
-rw-r--r--src/lib/baseline/wire_sepa.req (renamed from src/exchange-lib/baseline/wire_sepa.req)0
-rw-r--r--src/lib/baseline/wire_test.req (renamed from src/exchange-lib/baseline/wire_test.req)0
-rw-r--r--src/lib/exchange_api_common.c (renamed from src/exchange-lib/exchange_api_common.c)0
-rw-r--r--src/lib/exchange_api_curl_defaults.c (renamed from src/exchange-lib/curl_defaults.c)4
-rw-r--r--src/lib/exchange_api_curl_defaults.h (renamed from src/exchange-lib/curl_defaults.h)2
-rw-r--r--src/lib/exchange_api_deposit.c (renamed from src/exchange-lib/exchange_api_deposit.c)8
-rw-r--r--src/lib/exchange_api_handle.c (renamed from src/exchange-lib/exchange_api_handle.c)20
-rw-r--r--src/lib/exchange_api_handle.h (renamed from src/exchange-lib/exchange_api_handle.h)0
-rw-r--r--src/lib/exchange_api_payback.c (renamed from src/exchange-lib/exchange_api_payback.c)2
-rw-r--r--src/lib/exchange_api_refresh.c (renamed from src/exchange-lib/exchange_api_refresh.c)2
-rw-r--r--src/lib/exchange_api_refresh_link.c (renamed from src/exchange-lib/exchange_api_refresh_link.c)2
-rw-r--r--src/lib/exchange_api_refund.c (renamed from src/exchange-lib/exchange_api_refund.c)4
-rw-r--r--src/lib/exchange_api_reserve.c (renamed from src/exchange-lib/exchange_api_reserve.c)2
-rw-r--r--src/lib/exchange_api_track_transaction.c (renamed from src/exchange-lib/exchange_api_track_transaction.c)2
-rw-r--r--src/lib/exchange_api_track_transfer.c (renamed from src/exchange-lib/exchange_api_track_transfer.c)2
-rw-r--r--src/lib/exchange_api_wire.c (renamed from src/exchange-lib/exchange_api_wire.c)2
-rw-r--r--src/lib/test_auditor_api.c (renamed from src/auditor-lib/test_auditor_api.c)0
-rw-r--r--src/lib/test_auditor_api.conf (renamed from src/auditor-lib/test_auditor_api.conf)0
-rw-r--r--src/lib/test_auditor_api_expire_reserve_now.conf (renamed from src/auditor-lib/test_auditor_api_expire_reserve_now.conf)0
-rw-r--r--src/lib/test_exchange_api.conf (renamed from src/exchange-lib/test_exchange_api.conf)0
-rw-r--r--src/lib/test_exchange_api_expire_reserve_now.conf (renamed from src/exchange-lib/test_exchange_api_expire_reserve_now.conf)0
-rw-r--r--src/lib/test_exchange_api_home/.config/taler/account-1.json (renamed from src/auditor-lib/test_exchange_api_home/.config/taler/account-1.json)0
-rw-r--r--src/lib/test_exchange_api_home/.config/taler/account-2.json (renamed from src/auditor-lib/test_exchange_api_home/.config/taler/account-2.json)0
-rw-r--r--src/lib/test_exchange_api_home/.config/taler/sepa.json (renamed from src/auditor-lib/test_exchange_api_home/.config/taler/sepa.json)0
-rw-r--r--src/lib/test_exchange_api_home/.config/taler/test.json (renamed from src/auditor-lib/test_exchange_api_home/.config/taler/test.json)0
-rw-r--r--src/lib/test_exchange_api_home/.config/taler/x-taler-bank.json (renamed from src/auditor-lib/test_exchange_api_home/.config/taler/x-taler-bank.json)0
-rw-r--r--src/lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv (renamed from src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv)0
-rw-r--r--src/lib/test_exchange_api_keys_cherry_picking.conf (renamed from src/exchange-lib/test_exchange_api_keys_cherry_picking.conf)0
-rw-r--r--src/lib/test_exchange_api_keys_cherry_picking_extended.conf (renamed from src/exchange-lib/test_exchange_api_keys_cherry_picking_extended.conf)0
-rw-r--r--src/lib/test_exchange_api_keys_cherry_picking_extended_2.conf (renamed from src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf)0
-rw-r--r--src/lib/test_exchange_api_keys_cherry_picking_new.c (renamed from src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c)0
-rw-r--r--src/lib/test_exchange_api_new.c (renamed from src/exchange-lib/test_exchange_api_new.c)0
-rwxr-xr-xsrc/lib/test_exchange_api_overlapping_keys_bug.c (renamed from src/exchange-lib/test_exchange_api_overlapping_keys_bug.c)0
-rw-r--r--src/lib/test_exchange_api_twisted.c (renamed from src/exchange-lib/test_exchange_api_twisted.c)0
-rw-r--r--src/lib/test_exchange_api_twisted.conf (renamed from src/exchange-lib/test_exchange_api_twisted.conf)0
-rw-r--r--src/lib/testing_api_cmd_bank_check.c (renamed from src/exchange-lib/testing_api_cmd_bank_check.c)0
-rw-r--r--src/lib/testing_api_cmd_batch.c (renamed from src/exchange-lib/testing_api_cmd_batch.c)0
-rw-r--r--src/lib/testing_api_cmd_check_keys.c (renamed from src/exchange-lib/testing_api_cmd_check_keys.c)0
-rw-r--r--src/lib/testing_api_cmd_deposit.c (renamed from src/exchange-lib/testing_api_cmd_deposit.c)0
-rw-r--r--src/lib/testing_api_cmd_exec_aggregator.c (renamed from src/exchange-lib/testing_api_cmd_exec_aggregator.c)0
-rw-r--r--src/lib/testing_api_cmd_exec_auditor-sign.c (renamed from src/exchange-lib/testing_api_cmd_exec_auditor-sign.c)0
-rw-r--r--src/lib/testing_api_cmd_exec_keyup.c (renamed from src/exchange-lib/testing_api_cmd_exec_keyup.c)0
-rw-r--r--src/lib/testing_api_cmd_exec_wirewatch.c (renamed from src/exchange-lib/testing_api_cmd_exec_wirewatch.c)0
-rw-r--r--src/lib/testing_api_cmd_fakebank_transfer.c (renamed from src/exchange-lib/testing_api_cmd_fakebank_transfer.c)0
-rw-r--r--src/lib/testing_api_cmd_payback.c (renamed from src/exchange-lib/testing_api_cmd_payback.c)0
-rw-r--r--src/lib/testing_api_cmd_refresh.c (renamed from src/exchange-lib/testing_api_cmd_refresh.c)0
-rw-r--r--src/lib/testing_api_cmd_refund.c (renamed from src/exchange-lib/testing_api_cmd_refund.c)0
-rw-r--r--src/lib/testing_api_cmd_serialize_keys.c (renamed from src/exchange-lib/testing_api_cmd_serialize_keys.c)0
-rw-r--r--src/lib/testing_api_cmd_signal.c (renamed from src/exchange-lib/testing_api_cmd_signal.c)0
-rw-r--r--src/lib/testing_api_cmd_sleep.c (renamed from src/exchange-lib/testing_api_cmd_sleep.c)0
-rw-r--r--src/lib/testing_api_cmd_status.c (renamed from src/exchange-lib/testing_api_cmd_status.c)0
-rw-r--r--src/lib/testing_api_cmd_track.c (renamed from src/exchange-lib/testing_api_cmd_track.c)0
-rw-r--r--src/lib/testing_api_cmd_wire.c (renamed from src/exchange-lib/testing_api_cmd_wire.c)0
-rw-r--r--src/lib/testing_api_cmd_withdraw.c (renamed from src/exchange-lib/testing_api_cmd_withdraw.c)0
-rw-r--r--src/lib/testing_api_helpers.c (renamed from src/exchange-lib/testing_api_helpers.c)0
-rw-r--r--src/lib/testing_api_loop.c (renamed from src/exchange-lib/testing_api_loop.c)0
-rw-r--r--src/lib/testing_api_trait_amount.c (renamed from src/exchange-lib/testing_api_trait_amount.c)0
-rw-r--r--src/lib/testing_api_trait_blinding_key.c (renamed from src/exchange-lib/testing_api_trait_blinding_key.c)0
-rw-r--r--src/lib/testing_api_trait_cmd.c (renamed from src/exchange-lib/testing_api_trait_cmd.c)0
-rw-r--r--src/lib/testing_api_trait_coin_priv.c (renamed from src/exchange-lib/testing_api_trait_coin_priv.c)0
-rw-r--r--src/lib/testing_api_trait_denom_pub.c (renamed from src/exchange-lib/testing_api_trait_denom_pub.c)0
-rw-r--r--src/lib/testing_api_trait_denom_sig.c (renamed from src/exchange-lib/testing_api_trait_denom_sig.c)0
-rw-r--r--src/lib/testing_api_trait_exchange_pub.c (renamed from src/exchange-lib/testing_api_trait_exchange_pub.c)0
-rw-r--r--src/lib/testing_api_trait_exchange_sig.c (renamed from src/exchange-lib/testing_api_trait_exchange_sig.c)0
-rw-r--r--src/lib/testing_api_trait_fresh_coin.c (renamed from src/exchange-lib/testing_api_trait_fresh_coin.c)0
-rw-r--r--src/lib/testing_api_trait_json.c (renamed from src/exchange-lib/testing_api_trait_json.c)0
-rw-r--r--src/lib/testing_api_trait_key_peer.c (renamed from src/exchange-lib/testing_api_trait_key_peer.c)0
-rw-r--r--src/lib/testing_api_trait_number.c (renamed from src/exchange-lib/testing_api_trait_number.c)0
-rw-r--r--src/lib/testing_api_trait_process.c (renamed from src/exchange-lib/testing_api_trait_process.c)0
-rw-r--r--src/lib/testing_api_trait_reserve_priv.c (renamed from src/exchange-lib/testing_api_trait_reserve_priv.c)0
-rw-r--r--src/lib/testing_api_trait_string.c (renamed from src/exchange-lib/testing_api_trait_string.c)0
-rw-r--r--src/lib/testing_api_trait_wtid.c (renamed from src/exchange-lib/testing_api_trait_wtid.c)0
-rw-r--r--src/lib/testing_api_traits.c (renamed from src/exchange-lib/testing_api_traits.c)0
-rw-r--r--src/lib/testing_auditor_api_cmd_deposit_confirmation.c (renamed from src/auditor-lib/testing_auditor_api_cmd_deposit_confirmation.c)2
-rw-r--r--src/lib/testing_auditor_api_cmd_exchanges.c (renamed from src/auditor-lib/testing_auditor_api_cmd_exchanges.c)8
-rw-r--r--src/lib/testing_auditor_api_cmd_exec_auditor.c (renamed from src/auditor-lib/testing_auditor_api_cmd_exec_auditor.c)0
-rw-r--r--src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c (renamed from src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c)0
-rw-r--r--src/lib/testing_auditor_api_cmd_exec_wire_auditor.c (renamed from src/auditor-lib/testing_auditor_api_cmd_exec_wire_auditor.c)0
-rw-r--r--src/lib/testing_auditor_api_helpers.c (renamed from src/auditor-lib/testing_auditor_api_helpers.c)0
109 files changed, 123 insertions, 209 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8de5e4b8..80fa40db 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 7d16d95b..00000000
--- 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 523a6b9e..00000000
--- 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
- <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
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 d71a7722..00000000
--- 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 68f27cad..00000000
--- a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
+++ /dev/null
Binary files differ
diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am
index 4ac4efd6..193f539c 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 48093f2a..00000000
--- 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 159e0317..00000000
--- 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 b435ce86..00000000
--- 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 eca39424..00000000
--- 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 a15df27c..00000000
--- 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 39492693..00000000
--- 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
index f7fb55f0..59b1f316 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,25 @@ 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 \
+ -lgnunetjson \
+ -lgnunetutil \
+ -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 \
@@ -36,11 +56,20 @@ libtalerexchange_la_LIBADD = \
-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
index b0afcab3..b0afcab3 100644
--- a/src/exchange-lib/afl-generate.sh
+++ b/src/lib/afl-generate.sh
diff --git a/src/auditor-lib/curl_defaults.c b/src/lib/auditor_api_curl_defaults.c
index 7dadc950..d5b92400 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
index 3be5816b..3be5816b 100644
--- a/src/auditor-lib/curl_defaults.h
+++ b/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
index 736f326d..99c855fb 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
index 2ddd2e5b..770eedda 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
index 26eca74e..aca591dc 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
index c3c73f5c..c3c73f5c 100644
--- a/src/auditor-lib/auditor_api_handle.h
+++ b/src/lib/auditor_api_handle.h
diff --git a/src/exchange-lib/backoff.h b/src/lib/backoff.h
index 2af41e7c..2af41e7c 100644
--- a/src/exchange-lib/backoff.h
+++ b/src/lib/backoff.h
diff --git a/src/exchange-lib/baseline/admin_add_incoming.req b/src/lib/baseline/admin_add_incoming.req
index 677678b5..677678b5 100644
--- a/src/exchange-lib/baseline/admin_add_incoming.req
+++ b/src/lib/baseline/admin_add_incoming.req
diff --git a/src/exchange-lib/baseline/deposit.req b/src/lib/baseline/deposit.req
index a400796f..a400796f 100644
--- a/src/exchange-lib/baseline/deposit.req
+++ b/src/lib/baseline/deposit.req
diff --git a/src/exchange-lib/baseline/keys.req b/src/lib/baseline/keys.req
index a9503a86..a9503a86 100644
--- a/src/exchange-lib/baseline/keys.req
+++ b/src/lib/baseline/keys.req
diff --git a/src/exchange-lib/baseline/refresh_link.req b/src/lib/baseline/refresh_link.req
index acf3dff5..acf3dff5 100644
--- a/src/exchange-lib/baseline/refresh_link.req
+++ b/src/lib/baseline/refresh_link.req
diff --git a/src/exchange-lib/baseline/refresh_melt.req b/src/lib/baseline/refresh_melt.req
index 98b5b638..98b5b638 100644
--- a/src/exchange-lib/baseline/refresh_melt.req
+++ b/src/lib/baseline/refresh_melt.req
diff --git a/src/exchange-lib/baseline/refresh_reveal.req b/src/lib/baseline/refresh_reveal.req
index 3fb14396..3fb14396 100644
--- a/src/exchange-lib/baseline/refresh_reveal.req
+++ b/src/lib/baseline/refresh_reveal.req
diff --git a/src/exchange-lib/baseline/reserve_status.req b/src/lib/baseline/reserve_status.req
index 4f988f66..4f988f66 100644
--- a/src/exchange-lib/baseline/reserve_status.req
+++ b/src/lib/baseline/reserve_status.req
diff --git a/src/exchange-lib/baseline/reserve_withdraw.req b/src/lib/baseline/reserve_withdraw.req
index 48495025..48495025 100644
--- a/src/exchange-lib/baseline/reserve_withdraw.req
+++ b/src/lib/baseline/reserve_withdraw.req
diff --git a/src/exchange-lib/baseline/wire.req b/src/lib/baseline/wire.req
index a4f1d074..a4f1d074 100644
--- a/src/exchange-lib/baseline/wire.req
+++ b/src/lib/baseline/wire.req
diff --git a/src/exchange-lib/baseline/wire_sepa.req b/src/lib/baseline/wire_sepa.req
index 80d3d461..80d3d461 100644
--- a/src/exchange-lib/baseline/wire_sepa.req
+++ b/src/lib/baseline/wire_sepa.req
diff --git a/src/exchange-lib/baseline/wire_test.req b/src/lib/baseline/wire_test.req
index 684352c9..684352c9 100644
--- a/src/exchange-lib/baseline/wire_test.req
+++ b/src/lib/baseline/wire_test.req
diff --git a/src/exchange-lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 6b0aa6ff..6b0aa6ff 100644
--- a/src/exchange-lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
diff --git a/src/exchange-lib/curl_defaults.c b/src/lib/exchange_api_curl_defaults.c
index cd0f1aeb..45aa36b9 100644
--- a/src/exchange-lib/curl_defaults.c
+++ b/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"
/**
diff --git a/src/exchange-lib/curl_defaults.h b/src/lib/exchange_api_curl_defaults.h
index 07bab8fb..7ebf4e96 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
index 23066c7d..55b3ca6b 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
index afaabd85..9743b1f0 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;i<keys->num_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
index f06fa4ee..f06fa4ee 100644
--- a/src/exchange-lib/exchange_api_handle.h
+++ b/src/lib/exchange_api_handle.h
diff --git a/src/exchange-lib/exchange_api_payback.c b/src/lib/exchange_api_payback.c
index 9f800555..6c1772af 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
index 50c55835..b766b795 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
index 796608db..ea82c9ba 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
index 447e9ce0..75ebdc4e 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
index aa153f21..d4d0cb9a 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
index d61344e5..0942ce84 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
index cf87fe77..88043b7b 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
index 0d4644db..85d1835c 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
index cddd2119..cddd2119 100644
--- a/src/auditor-lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
diff --git a/src/auditor-lib/test_auditor_api.conf b/src/lib/test_auditor_api.conf
index 532f9c93..532f9c93 100644
--- a/src/auditor-lib/test_auditor_api.conf
+++ b/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
index 05bca956..05bca956 100644
--- a/src/auditor-lib/test_auditor_api_expire_reserve_now.conf
+++ b/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
index a44bab3a..a44bab3a 100644
--- a/src/exchange-lib/test_exchange_api.conf
+++ b/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
index 05bca956..05bca956 100644
--- a/src/exchange-lib/test_exchange_api_expire_reserve_now.conf
+++ b/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
index 48093f2a..48093f2a 100644
--- 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
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
index 159e0317..159e0317 100644
--- 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
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
index b435ce86..b435ce86 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/sepa.json
+++ b/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
index eca39424..eca39424 100644
--- a/src/auditor-lib/test_exchange_api_home/.config/taler/test.json
+++ b/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
index a15df27c..a15df27c 100644
--- 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
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
index 39492693..39492693 100644
--- 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
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf b/src/lib/test_exchange_api_keys_cherry_picking.conf
index 8d5585e3..8d5585e3 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
+++ b/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
index 29290c99..29290c99 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended.conf
+++ b/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
index cfa8b134..cfa8b134 100644
--- 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
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
index 45222a66..45222a66 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
+++ b/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
index bcbdb5ea..bcbdb5ea 100644
--- a/src/exchange-lib/test_exchange_api_new.c
+++ b/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
index d1fd7123..d1fd7123 100755
--- a/src/exchange-lib/test_exchange_api_overlapping_keys_bug.c
+++ b/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
index 1c530058..1c530058 100644
--- a/src/exchange-lib/test_exchange_api_twisted.c
+++ b/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
index ba59b5a6..ba59b5a6 100644
--- a/src/exchange-lib/test_exchange_api_twisted.conf
+++ b/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
index 265cba17..265cba17 100644
--- a/src/exchange-lib/testing_api_cmd_bank_check.c
+++ b/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
index a56c959a..a56c959a 100644
--- a/src/exchange-lib/testing_api_cmd_batch.c
+++ b/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
index d329f31a..d329f31a 100644
--- a/src/exchange-lib/testing_api_cmd_check_keys.c
+++ b/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
index 6fa2310d..6fa2310d 100644
--- a/src/exchange-lib/testing_api_cmd_deposit.c
+++ b/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
index c51d4498..c51d4498 100644
--- a/src/exchange-lib/testing_api_cmd_exec_aggregator.c
+++ b/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
index 90a1654c..90a1654c 100644
--- a/src/exchange-lib/testing_api_cmd_exec_auditor-sign.c
+++ b/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
index 576aab3c..576aab3c 100644
--- a/src/exchange-lib/testing_api_cmd_exec_keyup.c
+++ b/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
index a81bf5c2..a81bf5c2 100644
--- a/src/exchange-lib/testing_api_cmd_exec_wirewatch.c
+++ b/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
index 43f72573..43f72573 100644
--- a/src/exchange-lib/testing_api_cmd_fakebank_transfer.c
+++ b/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
index a4a3aeff..a4a3aeff 100644
--- a/src/exchange-lib/testing_api_cmd_payback.c
+++ b/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
index 55900cf2..55900cf2 100644
--- a/src/exchange-lib/testing_api_cmd_refresh.c
+++ b/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
index f6640d0f..f6640d0f 100644
--- a/src/exchange-lib/testing_api_cmd_refund.c
+++ b/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
index 38d32ead..38d32ead 100644
--- a/src/exchange-lib/testing_api_cmd_serialize_keys.c
+++ b/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
index f4fd8bb7..f4fd8bb7 100644
--- a/src/exchange-lib/testing_api_cmd_signal.c
+++ b/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
index 165d0aae..165d0aae 100644
--- a/src/exchange-lib/testing_api_cmd_sleep.c
+++ b/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
index 8e9290f6..8e9290f6 100644
--- a/src/exchange-lib/testing_api_cmd_status.c
+++ b/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
index 4898a097..4898a097 100644
--- a/src/exchange-lib/testing_api_cmd_track.c
+++ b/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
index 11354549..11354549 100644
--- a/src/exchange-lib/testing_api_cmd_wire.c
+++ b/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
index 7224f65e..7224f65e 100644
--- a/src/exchange-lib/testing_api_cmd_withdraw.c
+++ b/src/lib/testing_api_cmd_withdraw.c
diff --git a/src/exchange-lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index e56a57b9..e56a57b9 100644
--- a/src/exchange-lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
diff --git a/src/exchange-lib/testing_api_loop.c b/src/lib/testing_api_loop.c
index 3e7e3643..3e7e3643 100644
--- a/src/exchange-lib/testing_api_loop.c
+++ b/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
index 8f2b79d4..8f2b79d4 100644
--- a/src/exchange-lib/testing_api_trait_amount.c
+++ b/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
index 6e52d114..6e52d114 100644
--- a/src/exchange-lib/testing_api_trait_blinding_key.c
+++ b/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
index 61e97656..61e97656 100644
--- a/src/exchange-lib/testing_api_trait_cmd.c
+++ b/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
index b06e4a20..b06e4a20 100644
--- a/src/exchange-lib/testing_api_trait_coin_priv.c
+++ b/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
index 448a262c..448a262c 100644
--- a/src/exchange-lib/testing_api_trait_denom_pub.c
+++ b/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
index 03062c83..03062c83 100644
--- a/src/exchange-lib/testing_api_trait_denom_sig.c
+++ b/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
index e8cdfbb3..e8cdfbb3 100644
--- a/src/exchange-lib/testing_api_trait_exchange_pub.c
+++ b/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
index 97ce2d96..97ce2d96 100644
--- a/src/exchange-lib/testing_api_trait_exchange_sig.c
+++ b/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
index 1f6cdac2..1f6cdac2 100644
--- a/src/exchange-lib/testing_api_trait_fresh_coin.c
+++ b/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
index 5f6647fb..5f6647fb 100644
--- a/src/exchange-lib/testing_api_trait_json.c
+++ b/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
index d10623d2..d10623d2 100644
--- a/src/exchange-lib/testing_api_trait_key_peer.c
+++ b/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
index ee2e76db..ee2e76db 100644
--- a/src/exchange-lib/testing_api_trait_number.c
+++ b/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
index 449b6536..449b6536 100644
--- a/src/exchange-lib/testing_api_trait_process.c
+++ b/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
index 4a619d07..4a619d07 100644
--- a/src/exchange-lib/testing_api_trait_reserve_priv.c
+++ b/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
index 8b8f511a..8b8f511a 100644
--- a/src/exchange-lib/testing_api_trait_string.c
+++ b/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
index 67232971..67232971 100644
--- a/src/exchange-lib/testing_api_trait_wtid.c
+++ b/src/lib/testing_api_trait_wtid.c
diff --git a/src/exchange-lib/testing_api_traits.c b/src/lib/testing_api_traits.c
index aa6c79c8..aa6c79c8 100644
--- a/src/exchange-lib/testing_api_traits.c
+++ b/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
index 6a6e9857..ad02a6ef 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
index 71b82a39..ed4ca5e0 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
index afe9d38f..afe9d38f 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor.c
+++ b/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
index 09771660..09771660 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
+++ b/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
index 8371f969..8371f969 100644
--- a/src/auditor-lib/testing_auditor_api_cmd_exec_wire_auditor.c
+++ b/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
index 7e710315..7e710315 100644
--- a/src/auditor-lib/testing_auditor_api_helpers.c
+++ b/src/lib/testing_auditor_api_helpers.c