[taler-merchant] branch master updated: fix comparisons with TALER_amount_cmp_currency

[gnunet]

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

jonathan-buchanan pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 968b356  fix comparisons with TALER_amount_cmp_currency
968b356 is described below

commit 968b356e271ac67685dc5df2018e1750076f5a5e
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Fri Aug 14 02:07:21 2020 -0400

    fix comparisons with TALER_amount_cmp_currency
---
 .../taler-merchant-httpd_private-patch-instances-ID.c  |  4 ++--
 src/testing/test_merchant_api.c                        | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c 
b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
index 45abd39..d6fbb50 100644
--- a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
+++ b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
@@ -137,12 +137,12 @@ TMH_private_patch_instances_ID (const struct 
TMH_RequestHandler *rh,
                               is.address)) &&
             (1 == json_equal (mi->settings.jurisdiction,
                               is.jurisdiction)) &&
-            (0 == TALER_amount_cmp_currency (
+            (GNUNET_YES == TALER_amount_cmp_currency (
                &mi->settings.default_max_deposit_fee,
                &is.default_max_deposit_fee)) &&
             (0 == TALER_amount_cmp (&mi->settings.default_max_deposit_fee,
                                     &is.default_max_deposit_fee)) &&
-            (0 == TALER_amount_cmp_currency 
(&mi->settings.default_max_wire_fee,
+            (GNUNET_YES == TALER_amount_cmp_currency 
(&mi->settings.default_max_wire_fee,
                                              &is.default_max_wire_fee)) &&
             (0 == TALER_amount_cmp (&mi->settings.default_max_wire_fee,
                                     &is.default_max_wire_fee)) &&
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index 0e99fb4..5e62053 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -1170,6 +1170,24 @@ run (void *cls,
                                              "i1",
                                              MHD_HTTP_OK,
                                              "instance-create-i1"),
+    TALER_TESTING_cmd_merchant_patch_instance 
("instance-patch-i1-other-currency",
+                                               merchant_url,
+                                               "i1",
+                                               2,
+                                               payto_uris,
+                                               "bob-the-merchant",
+                                               json_pack ("{s:s}",
+                                                          "street",
+                                                          "bobstreet"),
+                                               json_pack ("{s:s}",
+                                                          "street",
+                                                          "bobjuryst"),
+                                               "USD:0.1",
+                                               4,
+                                               "USD:0.5",
+                                               GNUNET_TIME_UNIT_MINUTES,
+                                               GNUNET_TIME_UNIT_MINUTES,
+                                               MHD_HTTP_NO_CONTENT),
     TALER_TESTING_cmd_merchant_patch_instance ("instance-patch-i1",
                                                merchant_url,
                                                "i1",

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