remove redundant exchange_api_common.h header

13 files changed, 13 insertions, 64 deletions

diff --git a/src/exchange-lib/Makefile.am b/src/exchange-lib/Makefile.am
index 83fcf1475..19c36744d 100644
--- a/src/exchange-lib/Makefile.am
+++ b/src/exchange-lib/Makefile.am
@@ -14,7 +14,7 @@ libtalerexchange_la_LDFLAGS = \
   -no-undefined
 
 libtalerexchange_la_SOURCES = \
-  exchange_api_common.c exchange_api_common.h \
+  exchange_api_common.c \
   exchange_api_handle.c exchange_api_handle.h \
   exchange_api_admin.c \
   exchange_api_deposit.c \
diff --git a/src/exchange-lib/exchange_api_admin.c b/src/exchange-lib/exchange_api_admin.c
index e17cd780a..d50afdc6b 100644
--- a/src/exchange-lib/exchange_api_admin.c
+++ b/src/exchange-lib/exchange_api_admin.c
@@ -29,7 +29,6 @@
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
-#include "exchange_api_common.h"
 #include "taler_signatures.h"
 
 
diff --git a/src/exchange-lib/exchange_api_common.c b/src/exchange-lib/exchange_api_common.c
index 445e2f131..bd45619d8 100644
--- a/src/exchange-lib/exchange_api_common.c
+++ b/src/exchange-lib/exchange_api_common.c
@@ -20,7 +20,6 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "exchange_api_common.h"
 #include "taler_json_lib.h"
 #include <gnunet/gnunet_curl_lib.h>
 #include "exchange_api_handle.h"
diff --git a/src/exchange-lib/exchange_api_common.h b/src/exchange-lib/exchange_api_common.h
deleted file mode 100644
index bea36258e..000000000
--- a/src/exchange-lib/exchange_api_common.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2015 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 exchange-lib/exchange_api_common.h
- * @brief common functions for the exchange API
- * @author Christian Grothoff
- */
-#include <jansson.h>
-#include <gnunet/gnunet_util_lib.h>
-#include "taler_exchange_service.h"
-
-
-/**
- * Extract the Taler error code from the given @a json object.
- * Note that #TALER_EC_NONE is returned if no "code" is present.
- *
- * @param json response to extract the error code from
- * @return the "code" value from @a json
- */
-enum TALER_ErrorCode
-TALER_EXCHANGE_json_get_error_code (const json_t *json);
-
-
-/**
- * Verify a coins transaction history as returned by the exchange.
- *
- * @param currency expected currency for the coin
- * @param coin_pub public key of the coin
- * @param history history of the coin in json encoding
- * @param[out] total how much of the coin has been spent according to @a history
- * @return #GNUNET_OK if @a history is valid, #GNUNET_SYSERR if not
- */
-int
-TALER_EXCHANGE_verify_coin_history (const char *currency,
-                                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                                     json_t *history,
-                                     struct TALER_Amount *total);
-
-/* end of exchange_api_common.h */
diff --git a/src/exchange-lib/exchange_api_deposit.c b/src/exchange-lib/exchange_api_deposit.c
index 63ae87d05..416f4419c 100644
--- a/src/exchange-lib/exchange_api_deposit.c
+++ b/src/exchange-lib/exchange_api_deposit.c
@@ -29,7 +29,6 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
-#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 
diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/exchange-lib/exchange_api_refresh.c
index e185ef98b..556a53c48 100644
--- a/src/exchange-lib/exchange_api_refresh.c
+++ b/src/exchange-lib/exchange_api_refresh.c
@@ -28,7 +28,6 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
-#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 
diff --git a/src/exchange-lib/exchange_api_refresh_link.c b/src/exchange-lib/exchange_api_refresh_link.c
index c5dbc389a..32f3f2ad5 100644
--- a/src/exchange-lib/exchange_api_refresh_link.c
+++ b/src/exchange-lib/exchange_api_refresh_link.c
@@ -27,7 +27,6 @@
 #include "taler_exchange_service.h"
 #include "taler_json_lib.h"
 #include "exchange_api_handle.h"
-#include "exchange_api_common.h"
 #include "taler_signatures.h"
 
 
diff --git a/src/exchange-lib/exchange_api_refund.c b/src/exchange-lib/exchange_api_refund.c
index 73dd6ce51..0d5656e1f 100644
--- a/src/exchange-lib/exchange_api_refund.c
+++ b/src/exchange-lib/exchange_api_refund.c
@@ -28,7 +28,6 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
-#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 
diff --git a/src/exchange-lib/exchange_api_reserve.c b/src/exchange-lib/exchange_api_reserve.c
index bcf372580..bbba4f2b0 100644
--- a/src/exchange-lib/exchange_api_reserve.c
+++ b/src/exchange-lib/exchange_api_reserve.c
@@ -29,7 +29,6 @@
 #include "taler_exchange_service.h"
 #include "taler_json_lib.h"
 #include "exchange_api_handle.h"
-#include "exchange_api_common.h"
 #include "taler_signatures.h"
 
 
diff --git a/src/exchange-lib/exchange_api_track_transaction.c b/src/exchange-lib/exchange_api_track_transaction.c
index cf0685733..50e10c446 100644
--- a/src/exchange-lib/exchange_api_track_transaction.c
+++ b/src/exchange-lib/exchange_api_track_transaction.c
@@ -28,7 +28,6 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
-#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 
diff --git a/src/exchange-lib/exchange_api_track_transfer.c b/src/exchange-lib/exchange_api_track_transfer.c
index 0b45ecfc5..c4ad3fd20 100644
--- a/src/exchange-lib/exchange_api_track_transfer.c
+++ b/src/exchange-lib/exchange_api_track_transfer.c
@@ -26,7 +26,6 @@
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_exchange_service.h"
-#include "exchange_api_common.h"
 #include "taler_json_lib.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
diff --git a/src/exchange-lib/exchange_api_wire.c b/src/exchange-lib/exchange_api_wire.c
index 60e9113ab..71a717d4e 100644
--- a/src/exchange-lib/exchange_api_wire.c
+++ b/src/exchange-lib/exchange_api_wire.c
@@ -28,7 +28,6 @@
 #include "taler_exchange_service.h"
 #include "taler_json_lib.h"
 #include "taler_wire_plugin.h"
-#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 
 
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index d1f6dbbe3..1629ddcfa 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1262,4 +1262,16 @@ TALER_EXCHANGE_verify_coin_history (const char *currency,
                                     json_t *history,
                                     struct TALER_Amount *total);
 
+
+/**
+ * Extract the Taler error code from the given @a json object.
+ * Note that #TALER_EC_NONE is returned if no "code" is present.
+ *
+ * @param json response to extract the error code from
+ * @return the "code" value from @a json
+ */
+enum TALER_ErrorCode
+TALER_EXCHANGE_json_get_error_code (const json_t *json);
+
+
 #endif  /* _TALER_EXCHANGE_SERVICE_H */