-remove currency-based provider selection

5 files changed, 4 insertions, 35 deletions

diff --git a/src/backend/anastasis-httpd.c b/src/backend/anastasis-httpd.c
index 16e2a08..9b8c68e 100644
--- a/src/backend/anastasis-httpd.c
+++ b/src/backend/anastasis-httpd.c
@@ -73,11 +73,6 @@ const struct GNUNET_CONFIGURATION_Handle *AH_cfg;
 char *AH_backend_url;
 
 /**
- * Taler currency.
- */
-char *AH_currency;
-
-/**
  * Our fulfillment URL.
  */
 char *AH_fulfillment_url;
@@ -761,23 +756,6 @@ run (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      TALER_config_get_currency (config,
-                                 &AH_currency))
-  {
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (0 != strcasecmp (AH_currency,
-                       AH_annual_fee.currency))
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "anastasis",
-                               "ANNUAL_FEE",
-                               "currency mismatch");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (GNUNET_OK !=
       TALER_amount_cmp_currency (&AH_insurance,
                                  &AH_annual_fee))
   {
diff --git a/src/backend/anastasis-httpd.h b/src/backend/anastasis-httpd.h
index 8cc96b2..1a87921 100644
--- a/src/backend/anastasis-httpd.h
+++ b/src/backend/anastasis-httpd.h
@@ -175,11 +175,6 @@ extern struct TALER_Amount AH_question_cost;
 extern char *AH_backend_url;
 
 /**
- * Taler currency.
- */
-extern char *AH_currency;
-
-/**
  * Heap for processing timeouts of requests.
  */
 extern struct GNUNET_CONTAINER_Heap *AH_to_heap;
diff --git a/src/backend/anastasis-httpd_config.c b/src/backend/anastasis-httpd_config.c
index adabffb..015fd01 100644
--- a/src/backend/anastasis-httpd_config.c
+++ b/src/backend/anastasis-httpd_config.c
@@ -106,8 +106,6 @@ AH_handler_config (struct AH_RequestHandler *rh,
                              "0:0:0"),
     GNUNET_JSON_pack_string ("business_name",
                              AH_business_name),
-    GNUNET_JSON_pack_string ("currency",
-                             (char *) AH_currency),
     GNUNET_JSON_pack_array_steal ("methods",
                                   method_arr),
     GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes",
diff --git a/src/backend/anastasis-httpd_policy-upload.c b/src/backend/anastasis-httpd_policy-upload.c
index 32f0266..94a38bc 100644
--- a/src/backend/anastasis-httpd_policy-upload.c
+++ b/src/backend/anastasis-httpd_policy-upload.c
@@ -435,9 +435,8 @@ check_payment_cb (void *cls,
       const json_t *contract;
       struct TALER_Amount amount;
       struct GNUNET_JSON_Specification cspec[] = {
-        TALER_JSON_spec_amount ("amount",
-                                AH_currency,
-                                &amount),
+        TALER_JSON_spec_amount_any ("amount",
+                                    &amount),
         GNUNET_JSON_spec_end ()
       };
 
diff --git a/src/backend/anastasis-httpd_truth-upload.c b/src/backend/anastasis-httpd_truth-upload.c
index 642f523..356dc36 100644
--- a/src/backend/anastasis-httpd_truth-upload.c
+++ b/src/backend/anastasis-httpd_truth-upload.c
@@ -321,9 +321,8 @@ check_payment_cb (void *cls,
         const json_t *contract;
         struct TALER_Amount amount;
         struct GNUNET_JSON_Specification cspec[] = {
-          TALER_JSON_spec_amount ("amount",
-                                  AH_currency,
-                                  &amount),
+          TALER_JSON_spec_amount_any ("amount",
+                                      &amount),
           GNUNET_JSON_spec_end ()
         };