[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 03/03: fix payment details collection, fix callback us
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] 03/03: fix payment details collection, fix callback usage |
|
Date: |
Tue, 22 Dec 2020 13:30:30 +0100 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
commit 8fb324ecfe408a21d1c85be7baa991b31c9fbd6e
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Tue Dec 22 13:30:22 2020 +0100
fix payment details collection, fix callback usage
---
src/cli/anastasis-cli-redux.c | 4 +++
src/lib/anastasis.c | 7 +++++-
src/lib/anastasis_api_backup_redux.c | 47 ++++++++++++++++++++++++++----------
3 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/cli/anastasis-cli-redux.c b/src/cli/anastasis-cli-redux.c
index acc7f55..d7689c6 100644
--- a/src/cli/anastasis-cli-redux.c
+++ b/src/cli/anastasis-cli-redux.c
@@ -202,6 +202,10 @@ run (void *cls,
"Starting anastasis-reducer\n");
GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
NULL);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_log_setup ("anastasis-reducer",
+ "DEBUG",
+ NULL));
if (b_flag && r_flag)
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index fc301da..b9f9eb0 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -1459,7 +1459,7 @@ ANASTASIS_policy_create (const struct ANASTASIS_Truth
*truths[],
&truth->nonce,
sizeof(struct ANASTASIS_CRYPTO_NonceP));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "At %s:%d nocne is %s-%llu b\n", __FILE__, __LINE__,
+ "At %s:%d nonce is %s-%llu b\n", __FILE__, __LINE__,
TALER_B2S (&nonces[i]),
(unsigned long long) sizeof (nonces[i]));
}
@@ -2105,6 +2105,11 @@ ANASTASIS_secret_share (struct GNUNET_CURL_Context *ctx,
{
ss->pss[index_pss]->payment_secret
= pds[m].payment_secret;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "At %s:%d Payment-Identifier from PD is: %s\n",
+ __FILE__,
+ __LINE__,
+ TALER_B2S (&pds[m].payment_secret));
break;
}
}
diff --git a/src/lib/anastasis_api_backup_redux.c
b/src/lib/anastasis_api_backup_redux.c
index d72298a..531e165 100644
--- a/src/lib/anastasis_api_backup_redux.c
+++ b/src/lib/anastasis_api_backup_redux.c
@@ -1221,7 +1221,7 @@ check_uploads (json_t *uploads,
*/
static unsigned int
initialize_payment_details (json_t *state,
- struct ANASTASIS_PaymentDetails *pds)
+ struct ANASTASIS_PaymentDetails **pds)
{
const char *upload_key;
json_t *upload_value;
@@ -1229,7 +1229,7 @@ initialize_payment_details (json_t *state,
"recovery_document_uploads");
unsigned int pds_len = 0;
- if (json_object_size (rec_doc_uploads) > 0)
+ if (json_is_object (rec_doc_uploads))
{
json_object_foreach (rec_doc_uploads, upload_key, upload_value)
{
@@ -1241,6 +1241,16 @@ initialize_payment_details (json_t *state,
const char *provider_url = json_string_value (
json_object_get (upload_value,
"provider_url"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "At %s:%d Pay URI is: %s\n",
+ __FILE__,
+ __LINE__,
+ pay_uri);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "At %s:%d Provider URL is: %s\n",
+ __FILE__,
+ __LINE__,
+ provider_url);
if ((NULL != pay_uri) &&
(NULL != provider_url))
{
@@ -1266,7 +1276,7 @@ initialize_payment_details (json_t *state,
}
p_details.provider_url = GNUNET_strdup (provider_url);
TALER_MERCHANT_parse_pay_uri_free (&pd);
- GNUNET_array_append (pds,
+ GNUNET_array_append (*pds,
pds_len,
p_details);
}
@@ -1288,14 +1298,18 @@ initialize_policies (json_t *state)
json_t *rec_doc_uploads;
json_t *truth_uploads;
json_t *json_policy;
- json_t *json_policies = json_object_get (state,
- "policies");
+ json_t *json_policies;
+ json_policies = json_object_get (state,
+ "policies");
GNUNET_assert (json_is_array (json_policies));
truth_uploads = json_object_get (state,
"truth_uploads");
GNUNET_assert (json_is_object (truth_uploads));
- rec_doc_uploads = json_object ();
+ rec_doc_uploads = json_object_get (state,
+ "recovery_document_uploads");
+ if (NULL == rec_doc_uploads)
+ rec_doc_uploads = json_object ();
GNUNET_assert (json_is_object (rec_doc_uploads));
json_array_foreach (json_policies, p_index, json_policy)
@@ -1367,10 +1381,13 @@ initialize_policies (json_t *state)
}
}
}
- GNUNET_assert (0 ==
- json_object_set (state,
- "recovery_document_uploads",
- rec_doc_uploads));
+
+ if (NULL == json_object_get (state,
+ "recovery_document_uploads"))
+ GNUNET_assert (
+ 0 == json_object_set (state,
+ "recovery_document_uploads",
+ rec_doc_uploads));
GNUNET_array_append (policy_arr,
policy_arr_length,
@@ -1529,15 +1546,19 @@ secret_share_result_cb (void *cls,
set_state (sss->state,
ANASTASIS_backup_state_to_string (
ANASTASIS_BACKUP_STATE_BACKUP_FINISHED));
+ sss->cb (sss->cb_cls,
+ ANASTASIS_EC_NONE,
+ sss->state);
+ sss->cb = NULL;
+ return;
}
if (check_uploads (rec_doc_uploads, false))
{
sss->cb (sss->cb_cls,
ANASTASIS_EC_NONE,
sss->state);
- sss->cb = NULL;
+ return;
}
- return;
}
json_t *error = json_pack ("{s:I, s:s}",
@@ -1638,7 +1659,7 @@ upload_rec_documents (json_t *state,
}
pds_len = initialize_payment_details (state,
- pds);
+ &pds);
sss->state = json_incref (state);
// FIXME: implement PaymentDetails
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.