diff options
| -rw-r--r-- | src/backend/Makefile.am | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 4 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_exchanges.c | 3 | ||||
| -rw-r--r-- | src/merchant-tools/Makefile.am | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index bcd75a30..4faaa1bb 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -35,7 +35,7 @@ taler_merchant_httpd_LDADD = \ $(top_builddir)/src/backenddb/libtalermerchantdb.la \ -ltalerexchange \ -ltalermhd \ - -ltalerwire \ + -ltalerbank \ -ltalerjson \ -ltalerutil \ -ltalerpq \ diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 4f057fcb..395cff04 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -27,7 +27,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include <taler/taler_mhd_lib.h> -#include <taler/taler_wire_lib.h> +#include <taler/taler_bank_service.h> #include <taler/taler_exchange_service.h> #include "taler_merchantdb_lib.h" #include "taler-merchant-httpd.h" @@ -903,7 +903,7 @@ wireformat_iterator_cb (void *cls, wm = GNUNET_new (struct WireMethod); - wm->wire_method = TALER_BANK_payto_get_method (payto); + wm->wire_method = TALER_payto_get_method (payto); GNUNET_free (payto); GNUNET_asprintf (&instance_option, "ACTIVE_%s", diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index c5985ff3..bc966ec5 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -21,7 +21,6 @@ */ #include "platform.h" #include <taler/taler_json_lib.h> -#include <taler/taler_wire_lib.h> #include "taler-merchant-httpd_exchanges.h" @@ -441,7 +440,7 @@ process_wire_accounts (struct Exchange *exchange, { char *method; - method = TALER_BANK_payto_get_method (accounts[i].url); + method = TALER_payto_get_method (accounts[i].url); if (NULL == method) return GNUNET_SYSERR; if (GNUNET_OK != diff --git a/src/merchant-tools/Makefile.am b/src/merchant-tools/Makefile.am index faad2aa7..87e430bb 100644 --- a/src/merchant-tools/Makefile.am +++ b/src/merchant-tools/Makefile.am @@ -26,7 +26,6 @@ taler_merchant_benchmark_LDADD = \ -ltalertesting \ -ltalerfakebank \ -ltalerbank \ - -ltalerwire \ -ltalerexchange \ -ltalerjson \ -ltalerutil \ |