From d687446a136f683449478f78afa64b6fd977461a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20Kesim?= <oec-taler@kesim.org>
Date: Wed, 16 Feb 2022 01:08:07 +0100
Subject: [PATCH] small corrections after manual merge conflict resolutions

---
 src/exchange/taler-exchange-httpd_keys.c | 2 ++
 src/lib/exchange_api_link.c              | 1 +
 src/lib/exchange_api_refresh_common.c    | 3 +--
 src/lib/exchange_api_refreshes_reveal.c  | 4 ++--
 src/lib/exchange_api_withdraw.c          | 4 ++--
 src/testing/test_exchange_api.c          | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 4b0acd852..d1dfb28b9 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -804,6 +804,8 @@ load_age_mask (const char*section_name)
                       TEH_cfg,
                       section_name,
                       "AGE_RESTRICTED")))
+    return null_mask;
+
   {
     enum GNUNET_GenericReturnValue ret;
 
diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c
index 306ea9867..10ddd471d 100644
--- a/src/lib/exchange_api_link.c
+++ b/src/lib/exchange_api_link.c
@@ -144,6 +144,7 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
                               &alg_values,
                               &bks,
                               &lci->coin_priv,
+                              NULL, /* FIXME-oec. struct TALER_AgeCommitmentHash */
                               &c_hash,
                               &pd))
   {
diff --git a/src/lib/exchange_api_refresh_common.c b/src/lib/exchange_api_refresh_common.c
index 5f8152e1a..89ee1e178 100644
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@ -62,7 +62,6 @@ TALER_EXCHANGE_get_melt_data_ (
   struct MeltData *md)
 {
   struct TALER_Amount total;
-  struct TALER_AgeCommitmentHash ach = {0};
   struct TALER_CoinSpendPublicKeyP coin_pub;
   struct TALER_CsNonce nonces[rd->fresh_pks_len];
 
@@ -176,7 +175,7 @@ TALER_EXCHANGE_get_melt_data_ (
                                   &alg_values[j],
                                   bks,
                                   coin_priv,
-                                  ach,
+                                  NULL, /* FIXME-oec: This needs to be setup !*/
                                   &c_hash,
                                   &pd))
       {
diff --git a/src/lib/exchange_api_refreshes_reveal.c b/src/lib/exchange_api_refreshes_reveal.c
index 5714d743b..8d04c279a 100644
--- a/src/lib/exchange_api_refreshes_reveal.c
+++ b/src/lib/exchange_api_refreshes_reveal.c
@@ -162,9 +162,9 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
     GNUNET_assert (NULL != jsonai);
 
     if (! TALER_AgeCommitmentHash_isNullOrZero (
-          &rrh->md->melted_coin.h_age_commitment))
+          &rrh->md.melted_coin.h_age_commitment))
     {
-      ach = &rrh->md->fresh_ach[rrh->noreveal_index][i];
+      /* FIXME-oec:  need to pull fresh_ach from somewhere */
     }
 
     if (GNUNET_OK !=
diff --git a/src/lib/exchange_api_withdraw.c b/src/lib/exchange_api_withdraw.c
index 8bd9894ca..efc8a99c2 100644
--- a/src/lib/exchange_api_withdraw.c
+++ b/src/lib/exchange_api_withdraw.c
@@ -228,6 +228,7 @@ withdraw_cs_stage_two_callback (void *cls,
                                 &wh->alg_values,
                                 &wh->bks,
                                 &wh->priv,
+                                wh->ach,
                                 &wh->c_hash,
                                 &wh->pd))
     {
@@ -260,7 +261,6 @@ TALER_EXCHANGE_withdraw (
   void *res_cb_cls)
 {
   struct TALER_EXCHANGE_WithdrawHandle *wh;
-  bool age_restricted = (0 != pk->key.age_mask.mask);
 
   wh = GNUNET_new (struct TALER_EXCHANGE_WithdrawHandle);
   wh->exchange = exchange;
@@ -289,7 +289,7 @@ TALER_EXCHANGE_withdraw (
                                   &wh->alg_values,
                                   &wh->bks,
                                   &wh->priv,
-                                  &wh->ach,
+                                  wh->ach,
                                   &wh->c_hash,
                                   &wh->pd))
       {
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index 8e1a5b35b..6453fc96c 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -1048,7 +1048,7 @@ run (void *cls,
                                      MHD_HTTP_NO_CONTENT,
                                      false),
       TALER_TESTING_cmd_exec_offline_sign_extensions ("offline-sign-extensions",
-                                                      CONFIG_FILE),
+                                                      config_file),
       TALER_TESTING_cmd_wire_add ("add-wire-account",
                                   "payto://x-taler-bank/localhost/2",
                                   MHD_HTTP_NO_CONTENT,