[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: Minor fixes to paym
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: Minor fixes to payments generator. |
Date: |
Thu, 09 Mar 2017 22:00:06 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 5156e20 Minor fixes to payments generator.
5156e20 is described below
commit 5156e20973c4cc3c1510ba3b195054384273aef1
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Mar 9 21:59:47 2017 +0100
Minor fixes to payments generator.
---
src/samples/generate_payments.c | 91 +++--------------------------------------
1 file changed, 6 insertions(+), 85 deletions(-)
diff --git a/src/samples/generate_payments.c b/src/samples/generate_payments.c
index dc70a08..967fa54 100644
--- a/src/samples/generate_payments.c
+++ b/src/samples/generate_payments.c
@@ -955,91 +955,13 @@ interpreter_run (void *cls)
return;
}
- cmd->details.admin_add_incoming.aih
- = TALER_EXCHANGE_admin_add_incoming (exchange,
- "http://localhost:18080/",
- &reserve_pub,
- &amount,
- execution_date,
- sender_details,
- transfer_details,
- &add_incoming_cb,
- is);
- json_decref (sender_details);
- json_decref (transfer_details);
- if (NULL == cmd->details.admin_add_incoming.aih)
- {
- GNUNET_break (0);
- fail (is);
- return;
- }
- return;
- if (NULL !=
- cmd->details.admin_add_incoming.reserve_reference)
- {
- ref = find_command (is,
- cmd->details.admin_add_incoming.reserve_reference);
- GNUNET_assert (NULL != ref);
- GNUNET_assert (OC_ADMIN_ADD_INCOMING == ref->oc);
- cmd->details.admin_add_incoming.reserve_priv
- = ref->details.admin_add_incoming.reserve_priv;
- }
- else
- {
- struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
-
- priv = GNUNET_CRYPTO_eddsa_key_create ();
- cmd->details.admin_add_incoming.reserve_priv.eddsa_priv = *priv;
- GNUNET_free (priv);
- }
- GNUNET_CRYPTO_eddsa_key_get_public
(&cmd->details.admin_add_incoming.reserve_priv.eddsa_priv,
- &reserve_pub.eddsa_pub);
- if (GNUNET_OK !=
- TALER_string_to_amount (cmd->details.admin_add_incoming.amount,
- &amount))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to parse amount `%s' at %u\n",
- cmd->details.admin_add_incoming.amount,
- is->ip);
- fail (is);
- return;
- }
-
- execution_date = GNUNET_TIME_absolute_get ();
- GNUNET_TIME_round_abs (&execution_date);
- sender_details = json_loads
(cmd->details.admin_add_incoming.sender_details,
- JSON_REJECT_DUPLICATES,
- NULL);
- if (NULL == sender_details)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to parse sender details `%s' at %u\n",
- cmd->details.admin_add_incoming.sender_details,
- is->ip);
- fail (is);
- return;
- }
+ json_object_set (sender_details,
+ "bank_uri",
+ json_string (bank_uri));
- json_object_set (sender_details, "bank_uri", json_string (bank_uri));
-
- transfer_details = json_loads
(cmd->details.admin_add_incoming.transfer_details,
- JSON_REJECT_DUPLICATES,
- NULL);
-
- if (NULL == transfer_details)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to parse transfer details `%s' at %u\n",
- cmd->details.admin_add_incoming.transfer_details,
- is->ip);
- fail (is);
- return;
- }
-
cmd->details.admin_add_incoming.aih
= TALER_EXCHANGE_admin_add_incoming (exchange,
- "http://localhost:18080/",
+ exchange_uri,
&reserve_pub,
&amount,
execution_date,
@@ -1055,7 +977,6 @@ interpreter_run (void *cls)
fail (is);
return;
}
-
return;
case OC_WITHDRAW_SIGN:
@@ -1467,7 +1388,7 @@ main (int argc,
{ 'm', "merchant-uri", "MERCHANT_URI",
"Indicates the merchant backend's URI.", GNUNET_YES,
&GNUNET_GETOPT_set_string, &merchant_uri},
- { 'b', "merchant-uri", "MERCHANT_URI",
+ { 'b', "bank-uri", "BANK_URI",
"Indicates the bank's URI.", GNUNET_YES,
&GNUNET_GETOPT_set_string, &bank_uri},
GNUNET_GETOPT_OPTION_END
@@ -1586,7 +1507,7 @@ main (int argc,
return 77;
}
}
- while (wget_cmd);
+ while (0 != system (wget_cmd));
fprintf (stderr, "\n");
GNUNET_free (wget_cmd);
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: Minor fixes to payments generator.,
gnunet <=