diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-06-08 22:14:24 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-06-08 22:14:24 +0200 |
| commit | 3b9248e9c6d0abb3311dd7db25b5a227609b9bd1 (patch) | |
| tree | d66bb39a27104507557c78ba6deae45ac95fff7f /src/exchange-lib | |
| parent | 536163746e81e15cb5cb87c61e13907385460b4d (diff) | |
| parent | f50d4b0f359064c15087b9d7b8b1bba84b9e7e89 (diff) | |
| download | exchange-3b9248e9c6d0abb3311dd7db25b5a227609b9bd1.tar.xz | |
Merge branch 'master' of git+ssh://taler.net/var/git/exchange
Diffstat (limited to 'src/exchange-lib')
| -rw-r--r-- | src/exchange-lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/exchange-lib/test_exchange_api.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/exchange-lib/Makefile.am b/src/exchange-lib/Makefile.am index 757955579..3cab9d456 100644 --- a/src/exchange-lib/Makefile.am +++ b/src/exchange-lib/Makefile.am @@ -56,7 +56,7 @@ test_exchange_api_SOURCES = \ test_exchange_api_LDADD = \ libtalerexchange.la \ $(LIBGCRYPT_LIBS) \ - $(top_builddir)/src/bank-lib/libfakebank.la \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ -lgnunetcurl \ diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index 83fb0eb32..102c37b08 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -26,7 +26,7 @@ #include "taler_json_lib.h" #include <gnunet/gnunet_util_lib.h> #include <microhttpd.h> -#include "fakebank.h" +#include "taler_fakebank_lib.h" /** @@ -62,7 +62,7 @@ static struct GNUNET_SCHEDULER_Task *timeout_task; /** * Handle to our fakebank. */ -static struct FAKEBANK_Handle *fakebank; +static struct TALER_FAKEBANK_Handle *fakebank; /** * Result of the testcases, #GNUNET_OK on success @@ -2252,7 +2252,7 @@ interpreter_run (void *cls) return; } if (GNUNET_OK != - FAKEBANK_check (fakebank, + TALER_FAKEBANK_check (fakebank, &amount, cmd->details.check_bank_transfer.account_debit, cmd->details.check_bank_transfer.account_credit, @@ -2268,7 +2268,7 @@ interpreter_run (void *cls) case OC_CHECK_BANK_TRANSFERS_EMPTY: { if (GNUNET_OK != - FAKEBANK_check_empty (fakebank)) + TALER_FAKEBANK_check_empty (fakebank)) { GNUNET_break (0); fail (is); @@ -2580,7 +2580,7 @@ do_shutdown (void *cls) GNUNET_free (is); if (NULL != fakebank) { - FAKEBANK_stop (fakebank); + TALER_FAKEBANK_stop (fakebank); fakebank = NULL; } if (NULL != exchange) @@ -3012,7 +3012,7 @@ run (void *cls) &rc); GNUNET_assert (NULL != ctx); rc = GNUNET_CURL_gnunet_rc_create (ctx); - fakebank = FAKEBANK_start (8082); + fakebank = TALER_FAKEBANK_start (8082); exchange = TALER_EXCHANGE_connect (ctx, "http://localhost:8081", &cert_cb, is, |