[taler-merchant] branch master updated: fix

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 705d862  fix
705d862 is described below

commit 705d862c188b0f39e6dcd358ac45670ddc112b00
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jan 20 01:41:56 2020 +0100

    fix
---
 src/backend/taler-merchant-httpd_pay.c      |  7 ++++---
 src/backend/taler-merchant-httpd_proposal.c |  7 ++++---
 src/lib/merchant_api_pay.c                  |  7 ++++---
 src/lib/testing_api_cmd_check_payment.c     | 15 ++++++++++-----
 src/lib/testing_api_cmd_poll_payment.c      | 11 +++++++----
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index 0be292b..de00e87 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -553,9 +553,10 @@ sign_success_response (struct PayContext *pc)
       .h_contract_terms = pc->h_contract_terms
     };
 
-    GNUNET_CRYPTO_eddsa_sign (&pc->mi->privkey.eddsa_priv,
-                              &mr.purpose,
-                              &sig);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CRYPTO_eddsa_sign (&pc->mi->privkey.eddsa_priv,
+                                             &mr.purpose,
+                                             &sig));
   }
   resp = json_pack ("{s:O, s:o, s:o, s:o}",
                     "contract_terms",
diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index c8365b9..5e53143 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -210,9 +210,10 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
                                          "Could not hash order");
     }
 
-    GNUNET_CRYPTO_eddsa_sign (&mi->privkey.eddsa_priv,
-                              &pdps.purpose,
-                              &merchant_sig);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CRYPTO_eddsa_sign (&mi->privkey.eddsa_priv,
+                                             &pdps.purpose,
+                                             &merchant_sig));
   }
   return TALER_MHD_reply_json_pack (connection,
                                     MHD_HTTP_OK,
diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index e137d93..2637199 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -746,9 +746,10 @@ prepare_pay_generic (struct GNUNET_CURL_Context *ctx,
                        TALER_amount2s (&fee));
     }
 
-    GNUNET_CRYPTO_eddsa_sign (&coin->coin_priv.eddsa_priv,
-                              &dr.purpose,
-                              &p->coin_sig.eddsa_signature);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CRYPTO_eddsa_sign (&coin->coin_priv.eddsa_priv,
+                                             &dr.purpose,
+                                             &p->coin_sig.eddsa_signature));
     p->denom_pub = coin->denom_pub;
     p->denom_sig = coin->denom_sig;
     p->denom_value = coin->denom_value;
diff --git a/src/lib/testing_api_cmd_check_payment.c 
b/src/lib/testing_api_cmd_check_payment.c
index c879b78..816dd7f 100644
--- a/src/lib/testing_api_cmd_check_payment.c
+++ b/src/lib/testing_api_cmd_check_payment.c
@@ -182,6 +182,8 @@ conclude_task (void *cls)
   check_cmd =
     TALER_TESTING_interpreter_lookup_command (cpc->is,
                                               cpc->start_reference);
+  if (NULL == check_cmd)
+    TALER_TESTING_FAIL (cpc->is);
   cps = check_cmd->cls;
   if (NULL != cps->cpo)
   {
@@ -296,8 +298,9 @@ check_payment_run (void *cls,
   const char *order_id;
 
   cps->is = is;
-  proposal_cmd = TALER_TESTING_interpreter_lookup_command (
-    is, cps->proposal_reference);
+  proposal_cmd
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                cps->proposal_reference);
   if (NULL == proposal_cmd)
     TALER_TESTING_FAIL (is);
   if (GNUNET_OK != TALER_TESTING_get_trait_order_id (
@@ -437,9 +440,11 @@ check_payment_conclude_run (void *cls,
   struct CheckPaymentState *cps;
 
   cpc->is = is;
-  check_cmd =
-    TALER_TESTING_interpreter_lookup_command (is,
-                                              cpc->start_reference);
+  check_cmd
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                cpc->start_reference);
+  if (NULL == check_cmd)
+    TALER_TESTING_FAIL (cpc->is);
   GNUNET_assert (check_cmd->run == &check_payment_run);
   cps = check_cmd->cls;
   if (NULL == cps->cpo)
diff --git a/src/lib/testing_api_cmd_poll_payment.c 
b/src/lib/testing_api_cmd_poll_payment.c
index 40bc79e..8c9dd58 100644
--- a/src/lib/testing_api_cmd_poll_payment.c
+++ b/src/lib/testing_api_cmd_poll_payment.c
@@ -180,6 +180,8 @@ conclude_task (void *cls)
   poll_cmd =
     TALER_TESTING_interpreter_lookup_command (ppc->is,
                                               ppc->start_reference);
+  if (NULL == poll_cmd)
+    TALER_TESTING_FAIL (ppc->is);
   cps = poll_cmd->cls;
   if (NULL != cps->cpo)
   {
@@ -297,12 +299,11 @@ poll_payment_start_run (void *cls,
   const struct GNUNET_HashCode *h_contract;
 
   cps->is = is;
-  proposal_cmd = TALER_TESTING_interpreter_lookup_command (
-    is, cps->proposal_reference);
-
+  proposal_cmd
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                cps->proposal_reference);
   if (NULL == proposal_cmd)
     TALER_TESTING_FAIL (is);
-
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_order_id (proposal_cmd,
                                         0,
@@ -415,6 +416,8 @@ poll_payment_conclude_run (void *cls,
   poll_cmd =
     TALER_TESTING_interpreter_lookup_command (is,
                                               ppc->start_reference);
+  if (NULL == poll_cmd)
+    TALER_TESTING_FAIL (ppc->is);
   GNUNET_assert (poll_cmd->run == &poll_payment_start_run);
   cps = poll_cmd->cls;
   if (NULL == cps->cpo)

-- 
To stop receiving notification emails like this one, please contact
address@hidden.