diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 17:17:21 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 17:17:21 +0200 |
| commit | 5223abda2bcab0b33a67ff7817034954ec072095 (patch) | |
| tree | 2a33a3698dc568878061f35c01bd6a5cb3599be2 /src/backend/taler-merchant-httpd.c | |
| parent | aa3058cbd815f1badf0357f976232c0d17c1e614 (diff) | |
| parent | f9c3548be9788cf0ba47dcde88fa4e08fb911093 (diff) | |
| download | merchant-5223abda2bcab0b33a67ff7817034954ec072095.tar.gz merchant-5223abda2bcab0b33a67ff7817034954ec072095.tar.bz2 merchant-5223abda2bcab0b33a67ff7817034954ec072095.zip | |
Merge branch 'light'
Conflicts:
src/backend/Makefile.am
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 59f1d1c5..9ee31fb0 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -26,13 +26,8 @@ #include <gnunet/gnunet_util_lib.h> #include <taler/taler_json_lib.h> #include <taler/taler_mint_service.h> +#include <taler/taler_signatures.h> #include "taler-mint-httpd_parsing.h" -#include "taler-mint-httpd_mhd.h" -#include "taler-mint-httpd_admin.h" -#include "taler-mint-httpd_deposit.h" -#include "taler-mint-httpd_withdraw.h" -#include "taler-mint-httpd_refresh.h" -#include "taler-mint-httpd_keystate.h" #include "taler-mint-httpd_responses.h" #include "merchant.h" #include "merchant_db.h" @@ -79,45 +74,10 @@ static struct MHD_Daemon *mhd; PGconn *db_conn; /** - * Which currency is used by this mint? - * (verbatim copy from mint's code, just to make this - * merchant's source compile) - */ -char *TMH_mint_currency_string; - -/* As above */ -struct TALER_MINTDB_Plugin *TMH_plugin; - - -/** - * As above, though the merchant does need some form of - * configuration + * merchant's conf handle */ struct GNUNET_CONFIGURATION_Handle *cfg; - -/** - * As above - */ -int TMH_test_mode; - - -/** - * As above - */ -char *TMH_mint_directory; - - -/** - * As above - */ -struct GNUNET_CRYPTO_EddsaPublicKey TMH_master_public_key; - -/** - * As above - */ -char *TMH_expected_wire_format; - /** * Shutdown task identifier */ |