[taler-merchant] branch master updated: rename: TALER_config_get_denom->amount

[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 d251bce  rename: TALER_config_get_denom->amount
d251bce is described below

commit d251bce4f5a2653e166fc8068d1abc925caf98f5
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jan 19 20:38:36 2020 +0100

    rename: TALER_config_get_denom->amount
---
 src/backend/taler-merchant-httpd.c | 16 ++++++++--------
 src/lib/test_merchant_api.c        |  6 ++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index c477266..ccdf566 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1614,10 +1614,10 @@ run (void *cls,
   }
 
   if (GNUNET_OK !=
-      TALER_config_get_denom (config,
-                              "merchant",
-                              "DEFAULT_MAX_WIRE_FEE",
-                              &default_max_wire_fee))
+      TALER_config_get_amount (config,
+                               "merchant",
+                               "DEFAULT_MAX_WIRE_FEE",
+                               &default_max_wire_fee))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "merchant",
@@ -1627,10 +1627,10 @@ run (void *cls,
   }
 
   if (GNUNET_OK !=
-      TALER_config_get_denom (config,
-                              "merchant",
-                              "DEFAULT_MAX_DEPOSIT_FEE",
-                              &default_max_deposit_fee))
+      TALER_config_get_amount (config,
+                               "merchant",
+                               "DEFAULT_MAX_DEPOSIT_FEE",
+                               &default_max_deposit_fee))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "merchant",
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index 0078011..30d0823 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -223,8 +223,7 @@ run (void *cls,
      * Make a reserve exist,
      * according to the previous
      * transfer.
-     */
-    CMD_EXEC_WIREWATCH ("wirewatch-1"),
+     */CMD_EXEC_WIREWATCH ("wirewatch-1"),
     TALER_TESTING_cmd_check_bank_admin_transfer
       ("check_bank_transfer-2",
       "EUR:10.02",
@@ -530,8 +529,7 @@ run (void *cls,
        it, and finally (4) attempt to pick up a refund
        from it without any increasing taking place
        in the first place.
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-unincreased-refund",
+     */CMD_TRANSFER_TO_EXCHANGE ("create-reserve-unincreased-refund",
                               "EUR:5.01"),
 
     CMD_EXEC_WIREWATCH ("wirewatch-unincreased-refund"),

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