diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-09 19:40:59 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-09 19:40:59 +0100 |
| commit | 2af86bf65663939d8cb1d8c16ae36fbf7fba9b73 (patch) | |
| tree | 80c647aafcacf1690c4b2e060b38624e76e2668d | |
| parent | a3ceef42c217242cfaf21ab8fe2ef1acdbcf7a7f (diff) | |
| download | merchant-2af86bf65663939d8cb1d8c16ae36fbf7fba9b73.tar.gz merchant-2af86bf65663939d8cb1d8c16ae36fbf7fba9b73.tar.bz2 merchant-2af86bf65663939d8cb1d8c16ae36fbf7fba9b73.zip | |
Undoing last commit.
| -rw-r--r-- | src/samples/generate_payments.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/samples/generate_payments.c b/src/samples/generate_payments.c index 67f0c79e..b81ccf60 100644 --- a/src/samples/generate_payments.c +++ b/src/samples/generate_payments.c @@ -28,14 +28,12 @@ #define EXCHANGE_URI "http://localhost:8081/" +#define MERCHANT_URI "http://localhost:8082" + #define BANK_URI "http://localhost:8083/" #define ORDER_MAX_SIZE 1000 -const char *exchange_uri; - -const char *backend_uri; - /** * Task run on timeout. */ @@ -836,7 +834,7 @@ interpreter_run (void *cls) cmd->details.pay.ph = TALER_MERCHANT_pay_wallet (ctx, - backend_uri, + MERCHANT_URI, "default", &ref->details.proposal.hash, &total_amount, @@ -884,7 +882,7 @@ interpreter_run (void *cls) } cmd->details.proposal.po = TALER_MERCHANT_order_put (ctx, - backend_uri, + MERCHANT_URI, order, &proposal_cb, is); @@ -1459,7 +1457,6 @@ main () struct GNUNET_OS_Process *merchantd; unsigned int cnt; struct GNUNET_SIGNAL_Context *shc_chld; - char *wget_cmd; unsetenv ("XDG_DATA_HOME"); @@ -1569,10 +1566,6 @@ main () fprintf (stderr, "Waiting for taler-merchant-httpd to be ready\n"); cnt = 0; - - GNUNET_asprintf (&wget_cmd, - "wget -q -t 1 -T 1 %s -o /dev/null -O /dev/null", - backend_uri); do { fprintf (stderr, "."); @@ -1593,11 +1586,10 @@ main () return 77; } } - while (0 != system (wget_cmd)); - - GNUNET_free (wget_cmd); + while (0 != system ("wget -q -t 1 -T 1 " MERCHANT_URI " -o /dev/null -O /dev/null")); fprintf (stderr, "\n"); + result = GNUNET_SYSERR; sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO); GNUNET_assert (NULL != sigpipe); |