eliminate libtalerwire

3 files changed, 6 insertions, 6 deletions

diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index d5d7669bc..b2219e357 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -40,7 +40,7 @@ taler_auditor_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/wire/libtalerwire.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
   $(top_builddir)/src/auditordb/libtalerauditordb.la \
   -ljansson \
diff --git a/src/auditor/taler-auditor.c b/src/auditor/taler-auditor.c
index bb769fd6c..76285d554 100644
--- a/src/auditor/taler-auditor.c
+++ b/src/auditor/taler-auditor.c
@@ -41,7 +41,7 @@
 #include "taler_auditordb_plugin.h"
 #include "taler_exchangedb_plugin.h"
 #include "taler_json_lib.h"
-#include "taler_wire_lib.h"
+#include "taler_bank_service.h"
 #include "taler_signatures.h"
 
 
@@ -1459,7 +1459,7 @@ get_closing_fee (const char *receiver_account,
   struct TALER_Amount wire_fee;
   char *method;
 
-  method = TALER_WIRE_payto_get_method (receiver_account);
+  method = TALER_payto_get_method (receiver_account);
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "Method is `%s'\n",
               method);
@@ -2894,7 +2894,7 @@ check_wire_out_cb
   }
 
   /* Round down to amount supported by wire method */
-  GNUNET_break (TALER_WIRE_amount_round (&final_amount));
+  GNUNET_break (TALER_amount_round (&final_amount));
 
   /* Calculate the exchange's gain as the fees plus rounding differences! */
   if (GNUNET_OK !=
diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index bd9617466..4c1d6ac3b 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -652,7 +652,7 @@ do_shutdown (void *cls)
                                  wa_tail,
                                  wa);
     TALER_BANK_auth_free (&wa->auth);
-    TALER_WIRE_account_free (&wa->account);
+    TALER_BANK_account_free (&wa->account);
     GNUNET_free (wa->section_name);
     GNUNET_free (wa);
   }
@@ -2082,7 +2082,7 @@ process_account_cb (void *cls,
   if (TALER_PAC_X_TALER_BANK != wa->account.type)
   {
     GNUNET_break (0);
-    TALER_WIRE_account_free (&wa->account);
+    TALER_BANK_account_free (&wa->account);
     TALER_BANK_auth_free (&wa->auth);
     GNUNET_free (wa->section_name);
     GNUNET_free (wa);