From 458d1ac531f52e7802e054bfd151631af4d9d6e0 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 14 Jun 2020 15:17:11 +0200
Subject: clean up logic: use new EXCHANGE_YNA enum, avoid crazy macro
 construction to build URLs, use full power of TALER_url_join() instead

---
 src/lib/merchant_api_get_transfers.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/lib/merchant_api_get_transfers.c')

diff --git a/src/lib/merchant_api_get_transfers.c b/src/lib/merchant_api_get_transfers.c
index ac8382ca..552311c4 100644
--- a/src/lib/merchant_api_get_transfers.c
+++ b/src/lib/merchant_api_get_transfers.c
@@ -250,7 +250,7 @@ TALER_MERCHANT_transfers_get (
   const struct GNUNET_TIME_Absolute after,
   int64_t limit,
   uint64_t offset,
-  enum TALER_MERCHANT_YesNoAll verified,
+  enum TALER_EXCHANGE_YesNoAll verified,
   TALER_MERCHANT_GetTransfersCallback cb,
   void *cb_cls)
 {
@@ -266,10 +266,7 @@ TALER_MERCHANT_transfers_get (
   gth->ctx = ctx;
   gth->cb = cb;
   gth->cb_cls = cb_cls;
-  if (TALER_MERCHANT_YNA_YES == verified)
-    verified_s = "yes";
-  if (TALER_MERCHANT_YNA_NO == verified)
-    verified_s = "no";
+  verified_s = TALER_yna_to_string (verified);
   GNUNET_snprintf (limit_s,
                    sizeof (limit_s),
                    "%lld",
@@ -285,7 +282,9 @@ TALER_MERCHANT_transfers_get (
                              "payto_uri",
                              payto_uri,
                              "verified",
-                             verified_s,
+                             (TALER_EXCHANGE_YNA_ALL != verified)
+                             ? verified_s
+                             : NULL,
                              "limit",
                              0 != limit
                              ? limit_s
-- 
cgit v1.2.3