remove wallet-specific code

4 files changed, 0 insertions, 133 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index b1068d5d7..08ed62ec7 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,15 +1,6 @@
 # This Makefile.am is in the public domain
 talerincludedir = $(includedir)/taler
 
-if WALLET_ONLY
-talerinclude_HEADERS = \
-  platform.h \
-  taler_amount_lib.h \
-  taler_crypto_lib.h \
-  taler_util_wallet.h \
-  taler_signatures.h
-else
-
 talerinclude_HEADERS = \
   platform.h \
   taler_auditor_service.h \
@@ -32,8 +23,6 @@ talerinclude_HEADERS = \
   taler_pq_lib.h \
   taler_signatures.h
 
-endif
-
 EXTRA_DIST = \
   backoff.h \
   gauger.h
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index f8dc1e665..3e8bac650 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -22,13 +22,8 @@
 #ifndef TALER_CRYPTO_LIB_H
 #define TALER_CRYPTO_LIB_H
 
-#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
-#include <gnunet/gnunet_util_taler_wallet_lib.h>
-#include "taler_util_wallet.h"
-#endif
 
 #include <gcrypt.h>
 
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 1e27e8f9e..680b69886 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -27,12 +27,7 @@
 #ifndef TALER_SIGNATURES_H
 #define TALER_SIGNATURES_H
 
-#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
-#elif HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
-#include <gnunet/gnunet_util_taler_wallet_lib.h>
-#endif
-
 #include "taler_amount_lib.h"
 #include "taler_crypto_lib.h"
 
diff --git a/src/include/taler_util_wallet.h b/src/include/taler_util_wallet.h
deleted file mode 100644
index 249ee4571..000000000
--- a/src/include/taler_util_wallet.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014, 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 include/taler_util_wallet.h
- * @brief Interface for common utility functions for wallets
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- */
-#ifndef TALER_UTIL_H
-#define TALER_UTIL_H
-#include <gnunet/gnunet_util_taler_wallet_lib.h>
-#include "taler_amount_lib.h"
-#include "taler_crypto_lib.h"
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-
-/* Define logging functions */
-#define TALER_LOG_DEBUG(...)                                  \
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
-
-#define TALER_LOG_WARNING(...)                                \
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, __VA_ARGS__)
-
-#define TALER_LOG_ERROR(...)                                  \
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__)
-
-
-/**
- * Tests a given as assertion and if failed prints it as a warning with the
- * given reason
- *
- * @param EXP the expression to test as assertion
- * @param reason string to print as warning
- */
-#define TALER_assert_as(EXP, reason)                           \
-  do {                                                          \
-    if (EXP) break;                                             \
-    TALER_LOG_ERROR ("%s at %s:%d\n", reason, __FILE__, __LINE__);       \
-    abort ();                                                    \
-  } while (0)
-
-
-/**
- * Log an error message at log-level 'level' that indicates
- * a failure of the command 'cmd' with the message given
- * by gcry_strerror(rc).
- */
-#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR ( \
-                                             "`%s' failed at %s:%d with error: %s\n", \
-                                             cmd, __FILE__, __LINE__, \
-                                             gcry_strerror (rc)); } while (0)
-
-
-#define TALER_gcry_ok(cmd) \
-  do {int rc; rc = cmd; if (! rc) break; \
-      TALER_LOG_ERROR ("A Gcrypt call failed at %s:%d with error: %s\n", \
-                       __FILE__, \
-                       __LINE__, gcry_strerror (rc)); abort (); } while (0)
-
-
-/**
- * Initialize Gcrypt library.
- */
-void
-TALER_gcrypt_init (void);
-
-
-/**
- * Obtain denomination amount from configuration file.
- *
- * @param cfg configuration to parse
- * @param section section of the configuration to access
- * @param option option of the configuration to access
- * @param[out] denom set to the amount found in configuration
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-int
-TALER_config_get_denom (struct GNUNET_CONFIGURATION_Handle *cfg,
-                        const char *section,
-                        const char *option,
-                        struct TALER_Amount *denom);
-
-
-#if 0                           /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif