[taler-exchange] branch master updated: -add missing asserts, fix logic issue

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 6e566930 -add missing asserts, fix logic issue
6e566930 is described below

commit 6e56693071b29c1a06758f839dbba8ed63063d35
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Oct 22 00:14:20 2022 +0200

    -add missing asserts, fix logic issue
---
 src/benchmark/taler-aggregator-benchmark.c         |  1 +
 src/exchange/taler-exchange-httpd_kyc-proof.c      | 20 ++++++++++----------
 src/exchange/taler-exchange-httpd_reserves_purse.c |  5 +++--
 src/testing/testing_api_cmd_deposit.c              | 16 ++++++++++------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/benchmark/taler-aggregator-benchmark.c 
b/src/benchmark/taler-aggregator-benchmark.c
index bb7e47b0..869f0aae 100644
--- a/src/benchmark/taler-aggregator-benchmark.c
+++ b/src/benchmark/taler-aggregator-benchmark.c
@@ -283,6 +283,7 @@ add_deposit (const struct Merchant *m)
   d.coin.denom_pub_hash = h_denom_pub;
   d.coin.denom_sig = denom_sig;
   RANDOMIZE (&d.h_contract_terms);
+  d.coin.no_age_commitment = true;
   memset (&d.coin.h_age_commitment,
           0,
           sizeof (d.coin.h_age_commitment));
diff --git a/src/exchange/taler-exchange-httpd_kyc-proof.c 
b/src/exchange/taler-exchange-httpd_kyc-proof.c
index a3de470d..5d89c420 100644
--- a/src/exchange/taler-exchange-httpd_kyc-proof.c
+++ b/src/exchange/taler-exchange-httpd_kyc-proof.c
@@ -301,21 +301,21 @@ TEH_handler_kyc_proof (
                                          
TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
                                          args[1]);
     }
-    if (0 != strcmp (args[1],
-                     kpc->provider_section))
-    {
-      GNUNET_break_op (0);
-      return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                         "PROVIDER_SECTION");
-    }
-
     if (NULL != kpc->provider_section)
     {
       enum GNUNET_DB_QueryStatus qs;
       struct GNUNET_TIME_Absolute expiration;
 
+      if (0 != strcmp (args[1],
+                       kpc->provider_section))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           
TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                           "PROVIDER_SECTION");
+      }
+
       qs = TEH_plugin->lookup_kyc_process_by_account (
         TEH_plugin->cls,
         kpc->provider_section,
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c 
b/src/exchange/taler-exchange-httpd_reserves_purse.c
index d6131057..79625a39 100644
--- a/src/exchange/taler-exchange-httpd_reserves_purse.c
+++ b/src/exchange/taler-exchange-httpd_reserves_purse.c
@@ -613,8 +613,9 @@ TEH_handler_reserves_purse (
   if (no_purse_fee)
   {
     rpc.flags = TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA;
-    TALER_amount_set_zero (TEH_currency,
-                           &rpc.purse_fee);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TEH_currency,
+                                          &rpc.purse_fee));
   }
   else
   {
diff --git a/src/testing/testing_api_cmd_deposit.c 
b/src/testing/testing_api_cmd_deposit.c
index e48fec36..f6694767 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -709,15 +709,19 @@ TALER_TESTING_cmd_deposit_with_ref (const char *label,
     GNUNET_assert (0);
   }
   ds->wallet_timestamp = GNUNET_TIME_timestamp_get ();
-  json_object_set_new (ds->contract_terms,
-                       "timestamp",
-                       GNUNET_JSON_from_timestamp (ds->wallet_timestamp));
+  GNUNET_assert (0 ==
+                 json_object_set_new (ds->contract_terms,
+                                      "timestamp",
+                                      GNUNET_JSON_from_timestamp (
+                                        ds->wallet_timestamp)));
   if (0 != refund_deadline.rel_value_us)
   {
     ds->refund_deadline = GNUNET_TIME_relative_to_timestamp (refund_deadline);
-    json_object_set_new (ds->contract_terms,
-                         "refund_deadline",
-                         GNUNET_JSON_from_timestamp (ds->refund_deadline));
+    GNUNET_assert (0 ==
+                   json_object_set_new (ds->contract_terms,
+                                        "refund_deadline",
+                                        GNUNET_JSON_from_timestamp (
+                                          ds->refund_deadline)));
   }
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (amount,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.