[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 01/06: worked on dependency-fix
From: |
gnunet |
Subject: |
[taler-anastasis] 01/06: worked on dependency-fix |
Date: |
Wed, 19 Aug 2020 12:32:22 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
commit 8a9e100eb3cff25745a4e9d60870f36b0dfef858
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Sat Aug 15 18:31:02 2020 +0000
worked on dependency-fix
---
src/backend/anastasis-httpd_policy_upload.c | 77 +++++++++++++++--------------
src/backend/anastasis-httpd_truth.c | 2 +-
src/cli/anastasis-cli-splitter.c | 6 +--
src/lib/anastasis_api_policy_store.c | 2 +-
src/lib/anastasis_api_truth_store.c | 2 +-
src/lib/testing_api_cmd_policy_store.c | 2 +-
src/lib/testing_api_cmd_truth_store.c | 2 +-
src/lib/testing_cmd_policy_create.c | 2 +-
src/lib/testing_cmd_secret_share.c | 2 +-
9 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/src/backend/anastasis-httpd_policy_upload.c
b/src/backend/anastasis-httpd_policy_upload.c
index 5c29894..d98f42c 100644
--- a/src/backend/anastasis-httpd_policy_upload.c
+++ b/src/backend/anastasis-httpd_policy_upload.c
@@ -98,12 +98,12 @@ struct PolicyUploadContext
/**
* Used while we are awaiting proposal creation.
*/
- struct TALER_MERCHANT_ProposalOperation *po;
+ struct TALER_MERCHANT_PostOrdersOperation *po;
/**
* Used while we are waiting payment.
*/
- struct TALER_MERCHANT_CheckPaymentOperation *cpo;
+ struct TALER_MERCHANT_OrderMerchantGetHandle *cpo;
/**
* HTTP response code to use on resume, if non-NULL.
@@ -176,12 +176,12 @@ AH_resume_all_bc ()
MHD_resume_connection (puc->con);
if (NULL != puc->po)
{
- TALER_MERCHANT_proposal_cancel (puc->po);
+ TALER_MERCHANT_orders_post_cancel (puc->po);
puc->po = NULL;
}
if (NULL != puc->cpo)
{
- TALER_MERCHANT_check_payment_cancel (puc->cpo);
+ TALER_MERCHANT_merchant_order_get_cancel (puc->cpo);
puc->cpo = NULL;
}
}
@@ -199,13 +199,13 @@ cleanup_ctx (struct TM_HandlerContext *hc)
struct PolicyUploadContext *puc = (struct PolicyUploadContext *) hc;
if (NULL != puc->po)
- TALER_MERCHANT_proposal_cancel (puc->po);
+ TALER_MERCHANT_orders_post_cancel (puc->po);
if (NULL != puc->hash_ctx)
GNUNET_CRYPTO_hash_context_abort (puc->hash_ctx);
if (NULL != puc->resp)
MHD_destroy_response (puc->resp);
- GNUNET_free_non_null (puc->existing_order_id);
- GNUNET_free_non_null (puc->upload);
+ GNUNET_free (puc->existing_order_id);
+ GNUNET_free (puc->upload);
GNUNET_free (puc);
}
@@ -273,13 +273,16 @@ amount_to_post_counter (const struct TALER_Amount *amount)
static void
proposal_cb (void *cls,
const struct TALER_MERCHANT_HttpResponse *hr,
- const char *order_id)
+ const char *order_id,
+ const struct TALER_ClaimTokenP *claim_token)
{
struct PolicyUploadContext *puc = cls;
enum ANASTASIS_DB_QueryStatus qs;
uint32_t post_counter;
puc->po = NULL;
+ if (NULL != claim_token)
+ puc->claim_token = *claim_token;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Resuming connection with order `%s'\n",
order_id);
@@ -370,7 +373,7 @@ ongoing_payment_cb (void *cls,
if ( (NULL == puc->existing_order_id) ||
(puc->existing_order_timestamp.abs_value_us < timestamp.abs_value_us) )
{
- GNUNET_free_non_null (puc->existing_order_id);
+ GNUNET_free (puc->existing_order_id);
puc->existing_order_id = GNUNET_strdup (order_id);
puc->existing_order_timestamp = timestamp;
}
@@ -381,24 +384,18 @@ ongoing_payment_cb (void *cls,
* Callback to process a GET /check-payment request
*
* @param cls our `struct PolicyUploadContext`
- * @param hr HTTP response
- * @param paid #GNUNET_YES if the payment is settled, #GNUNET_NO if not
- * settled, $GNUNET_SYSERR on error
- * (note that refunded payments are returned as paid!)
- * @param refunded #GNUNET_YES if there is at least on refund on this payment,
- * #GNUNET_NO if refunded, #GNUNET_SYSERR or error
- * @param refunded_amount amount that was refunded, NULL if there
- * was no refund
- * @param taler_pay_uri the URI that instructs the wallets to process
- * the payment
+ * @param hr HTTP response details
+ * @param osr order status
*/
static void
check_payment_cb (void *cls,
const struct TALER_MERCHANT_HttpResponse *hr,
- int paid,
- int refunded,
- struct TALER_Amount *refund_amount,
- const char *taler_pay_uri)
+ // int paid, FIXME: DELETE
+ // int refunded, FIXME: DELETE
+ // struct TALER_Amount *refund_amount, FIXME: DELETE
+ // const char *taler_pay_uri) FIXME: DELETE
+ const struct TALER_MERCHANT_OrderStatusResponse *osr)
+
{
struct PolicyUploadContext *puc = cls;
@@ -406,15 +403,19 @@ check_payment_cb (void *cls,
puc->cpo = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Payment status checked: %s\n",
- paid ? "paid" : "unpaid");
+ osr->paid ? "paid" : "unpaid");
GNUNET_CONTAINER_DLL_remove (puc_head,
puc_tail,
puc);
MHD_resume_connection (puc->con);
AH_trigger_daemon ();
+
+ /**
+ * FIXME: DELETE
GNUNET_break ( (GNUNET_NO == refunded) &&
(NULL == refund_amount) );
- if (paid)
+ */
+ if (osr->paid)
{
enum ANASTASIS_DB_QueryStatus qs;
@@ -467,13 +468,14 @@ await_payment (struct PolicyUploadContext *puc,
puc);
MHD_suspend_connection (puc->con);
puc->order_id = order_id;
- puc->cpo = TALER_MERCHANT_check_payment (AH_ctx,
- AH_backend_url,
- order_id,
- NULL /* our payments are NOT
session-bound */,
- timeout,
- &check_payment_cb,
- puc);
+ puc->cpo = TALER_MERCHANT_merchant_order_get (AH_ctx,
+ AH_backend_url,
+ order_id,
+ NULL /* our payments are NOT
session-bound */,
+ false,
+ timeout,
+ &check_payment_cb,
+ puc);
AH_trigger_curl ();
}
@@ -544,11 +546,12 @@ begin_payment (struct PolicyUploadContext *puc,
"fulfillment_url", AH_fulfillment_url,
"order_id", order_id);
- puc->po = TALER_MERCHANT_order_put (AH_ctx,
- AH_backend_url,
- order,
- &proposal_cb,
- puc);
+ puc->po = TALER_MERCHANT_orders_post (AH_ctx,
+ AH_backend_url,
+ order,
+ GNUNET_TIME_UNIT_ZERO,
+ &proposal_cb,
+ puc);
AH_trigger_curl ();
json_decref (order);
diff --git a/src/backend/anastasis-httpd_truth.c
b/src/backend/anastasis-httpd_truth.c
index b97bec3..053402b 100644
--- a/src/backend/anastasis-httpd_truth.c
+++ b/src/backend/anastasis-httpd_truth.c
@@ -190,6 +190,6 @@ AH_handler_truth_get (struct MHD_Connection *connection,
}
}
}
- GNUNET_free_non_null (decrypted_truth);
+ GNUNET_free (decrypted_truth);
return MHD_NO;
}
\ No newline at end of file
diff --git a/src/cli/anastasis-cli-splitter.c b/src/cli/anastasis-cli-splitter.c
index 07f29f9..526cfc6 100644
--- a/src/cli/anastasis-cli-splitter.c
+++ b/src/cli/anastasis-cli-splitter.c
@@ -1253,7 +1253,7 @@ shutdown_task (void *cls)
{
GNUNET_free (tu_states[i].truth);
GNUNET_free (tu_states[i].method);
- GNUNET_free_non_null (tu_states[i].secret_answer);
+ GNUNET_free (tu_states[i].secret_answer);
}
}
@@ -1265,9 +1265,9 @@ shutdown_task (void *cls)
GNUNET_free (servers[i].backend_methods);
}
}
- GNUNET_free_non_null (servers);
+ GNUNET_free (servers);
- GNUNET_free_non_null (pds);
+ GNUNET_free (pds);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Shutdown complete\n");
diff --git a/src/lib/anastasis_api_policy_store.c
b/src/lib/anastasis_api_policy_store.c
index 5f2465c..5adcf86 100644
--- a/src/lib/anastasis_api_policy_store.c
+++ b/src/lib/anastasis_api_policy_store.c
@@ -90,7 +90,7 @@ ANASTASIS_policy_store_cancel (struct
GNUNET_CURL_job_cancel (pso->job);
pso->job = NULL;
}
- GNUNET_free_non_null (pso->pay_uri);
+ GNUNET_free (pso->pay_uri);
GNUNET_free (pso->url);
GNUNET_free (pso);
}
diff --git a/src/lib/anastasis_api_truth_store.c
b/src/lib/anastasis_api_truth_store.c
index 3370224..e010315 100644
--- a/src/lib/anastasis_api_truth_store.c
+++ b/src/lib/anastasis_api_truth_store.c
@@ -81,7 +81,7 @@ ANASTASIS_truth_store_cancel (struct
GNUNET_CURL_job_cancel (tso->job);
tso->job = NULL;
}
- GNUNET_free_non_null (tso->pay_uri);
+ GNUNET_free (tso->pay_uri);
GNUNET_free (tso->url);
GNUNET_free (tso);
}
diff --git a/src/lib/testing_api_cmd_policy_store.c
b/src/lib/testing_api_cmd_policy_store.c
index 0d3eeb3..747b196 100644
--- a/src/lib/testing_api_cmd_policy_store.c
+++ b/src/lib/testing_api_cmd_policy_store.c
@@ -408,7 +408,7 @@ policy_store_cleanup (void *cls,
pss->pso = NULL;
}
- GNUNET_free_non_null (pss->payment_order_id);
+ GNUNET_free (pss->payment_order_id);
GNUNET_free (pss);
}
diff --git a/src/lib/testing_api_cmd_truth_store.c
b/src/lib/testing_api_cmd_truth_store.c
index 910cf77..1de47d0 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -308,7 +308,7 @@ truth_store_cleanup (void *cls,
tss->tso = NULL;
}
- GNUNET_free_non_null ((void *) tss->payment_order_id);
+ GNUNET_free ((void *) tss->payment_order_id);
GNUNET_free (tss);
}
diff --git a/src/lib/testing_cmd_policy_create.c
b/src/lib/testing_cmd_policy_create.c
index d1086e7..07d3a66 100644
--- a/src/lib/testing_cmd_policy_create.c
+++ b/src/lib/testing_cmd_policy_create.c
@@ -141,7 +141,7 @@ policy_create_cleanup (void *cls,
{
struct PolicyCreateState *pcs = cls;
- GNUNET_free_non_null (pcs->cmd_label_array);
+ GNUNET_free (pcs->cmd_label_array);
GNUNET_free (pcs);
}
diff --git a/src/lib/testing_cmd_secret_share.c
b/src/lib/testing_cmd_secret_share.c
index 1304cee..02fd4fb 100644
--- a/src/lib/testing_cmd_secret_share.c
+++ b/src/lib/testing_cmd_secret_share.c
@@ -369,7 +369,7 @@ secret_share_cleanup (void *cls,
{
struct SecretShareState *sss = cls;
- GNUNET_free_non_null (sss->cmd_label_array);
+ GNUNET_free (sss->cmd_label_array);
GNUNET_free (sss);
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis] branch master updated (a735150 -> 8b5083a), gnunet, 2020/08/19
- [taler-anastasis] 01/06: worked on dependency-fix,
gnunet <=
- [taler-anastasis] 02/06: fixed Anastasis to build, testing fails, gnunet, 2020/08/19
- [taler-anastasis] 03/06: fixed error with GNUNET_CRYPTO_pow_hash, gnunet, 2020/08/19
- [taler-anastasis] 06/06: fix api test, gnunet, 2020/08/19
- [taler-anastasis] 05/06: fixed salt issue with GNUNET_CRYPTO_pow_hash, gnunet, 2020/08/19
- [taler-anastasis] 04/06: fixed some dependencies in testing, gnunet, 2020/08/19