Merge branch 'master' of git+ssh://git.taler.net/exchange

4 files changed, 22 insertions, 46 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b775719e6..00b604acf 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -21,6 +21,7 @@ libtalerexchange_la_LDFLAGS = \
   -version-info 5:0:0 \
   -no-undefined
 libtalerexchange_la_SOURCES = \
+  exchange_api_add_aml_decision.c \
   exchange_api_auditor_add_denomination.c \
   exchange_api_batch_deposit.c \
   exchange_api_batch_withdraw.c \
@@ -37,6 +38,7 @@ libtalerexchange_la_SOURCES = \
   exchange_api_kyc_proof.c \
   exchange_api_kyc_wallet.c \
   exchange_api_link.c \
+  exchange_api_management_add_partner.c \
   exchange_api_management_auditor_disable.c \
   exchange_api_management_auditor_enable.c \
   exchange_api_management_drain_profits.c \
@@ -47,6 +49,7 @@ libtalerexchange_la_SOURCES = \
   exchange_api_management_revoke_signing_key.c \
   exchange_api_management_set_global_fee.c \
   exchange_api_management_set_wire_fee.c \
+  exchange_api_management_update_aml_officer.c \
   exchange_api_management_wire_disable.c \
   exchange_api_management_wire_enable.c \
   exchange_api_melt.c \
diff --git a/src/lib/exchange_api_add_aml_decision.c b/src/lib/exchange_api_add_aml_decision.c
index 34c984a75..0a1b70cdf 100644
--- a/src/lib/exchange_api_add_aml_decision.c
+++ b/src/lib/exchange_api_add_aml_decision.c
@@ -136,7 +136,7 @@ TALER_EXCHANGE_add_aml_decision (
   TALER_EXCHANGE_AddAmlDecisionCallback cb,
   void *cb_cls)
 {
-  struct TALER_AmlOfficerPrivateKeyP officer_pub;
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
   struct TALER_AmlOfficerSignatureP officer_sig;
   struct TALER_EXCHANGE_AddAmlDecision *wh;
   CURL *eh;
@@ -146,6 +146,7 @@ TALER_EXCHANGE_add_aml_decision (
                                       &officer_pub.eddsa_pub);
   TALER_officer_aml_decision_sign (justification,
                                    decision_time,
+                                   new_threshold,
                                    h_payto,
                                    new_state,
                                    officer_priv,
@@ -187,8 +188,8 @@ TALER_EXCHANGE_add_aml_decision (
                                 &officer_sig),
     GNUNET_JSON_pack_data_auto ("h_payto",
                                 h_payto),
-    GNUNET_JSON_pack_data_uint64 ("state",
-                                  (uint32_t) new_state),
+    GNUNET_JSON_pack_uint64 ("state",
+                             (uint32_t) new_state),
     TALER_JSON_pack_amount ("new_threshold",
                             new_threshold),
     GNUNET_JSON_pack_timestamp ("decision_time",
diff --git a/src/lib/exchange_api_management_add_partner.c b/src/lib/exchange_api_management_add_partner.c
index 264fd664e..75fb8aa6f 100644
--- a/src/lib/exchange_api_management_add_partner.c
+++ b/src/lib/exchange_api_management_add_partner.c
@@ -66,7 +66,7 @@ struct TALER_EXCHANGE_ManagementAddPartner
 
 /**
  * Function called when we're done processing the
- * HTTP POST /aml-decision/$OFFICER_PUB request.
+ * HTTP POST /management/partners request.
  *
  * @param cls the `struct TALER_EXCHANGE_ManagementAddPartner *`
  * @param response_code HTTP response code, 0 on error
@@ -145,25 +145,9 @@ TALER_EXCHANGE_management_add_partner (
   wh->cb = cb;
   wh->cb_cls = cb_cls;
   wh->ctx = ctx;
-  {
-    char *path;
-    char opus[sizeof (*partner_pub) * 2];
-    char *end;
-
-    end = GNUNET_STRINGS_data_to_string (
-      partner_pub,
-      sizeof (*partner_pub),
-      opus,
-      sizeof (opus));
-    *end = '\0';
-    GNUNET_asprintf (&path,
-                     "management/partners/%s",
-                     opus);
-    wh->url = TALER_url_join (url,
-                              path,
-                              NULL);
-    GNUNET_free (path);
-  }
+  wh->url = TALER_url_join (url,
+                            "management/partners",
+                            NULL);
   if (NULL == wh->url)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -180,6 +164,8 @@ TALER_EXCHANGE_management_add_partner (
                                 end_date),
     GNUNET_JSON_pack_time_rel ("wad_frequency",
                                wad_frequency),
+    GNUNET_JSON_pack_data_auto ("partner_pub",
+                                &partner_pub),
     GNUNET_JSON_pack_data_auto ("master_sig",
                                 &master_sig),
     TALER_JSON_pack_amount ("wad_fee",
diff --git a/src/lib/exchange_api_management_update_aml_officer.c b/src/lib/exchange_api_management_update_aml_officer.c
index bdc0dbe4a..6e1669465 100644
--- a/src/lib/exchange_api_management_update_aml_officer.c
+++ b/src/lib/exchange_api_management_update_aml_officer.c
@@ -144,25 +144,9 @@ TALER_EXCHANGE_management_update_aml_officer (
   wh->cb = cb;
   wh->cb_cls = cb_cls;
   wh->ctx = ctx;
-  {
-    char *path;
-    char opus[sizeof (*officer_pub) * 2];
-    char *end;
-
-    end = GNUNET_STRINGS_data_to_string (
-      officer_pub,
-      sizeof (*officer_pub),
-      opus,
-      sizeof (opus));
-    *end = '\0';
-    GNUNET_asprintf (&path,
-                     "management/aml-officers/%s",
-                     opus);
-    wh->url = TALER_url_join (url,
-                              path,
-                              NULL);
-    GNUNET_free (path);
-  }
+  wh->url = TALER_url_join (url,
+                            "management/aml-officers",
+                            NULL);
   if (NULL == wh->url)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -173,12 +157,14 @@ TALER_EXCHANGE_management_update_aml_officer (
   body = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_string ("officer_name",
                              officer_name),
+    GNUNET_JSON_pack_data_auto ("officer_pub",
+                                officer_pub),
     GNUNET_JSON_pack_data_auto ("master_sig",
                                 master_sig),
-    GNUNET_JSON_pack_data_bool ("is_active",
-                                is_active),
-    GNUNET_JSON_pack_data_bool ("read_only",
-                                read_only),
+    GNUNET_JSON_pack_bool ("is_active",
+                           is_active),
+    GNUNET_JSON_pack_bool ("read_only",
+                           read_only),
     GNUNET_JSON_pack_timestamp ("change_date",
                                 change_date));
   eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);