[taler-anastasis] branch master updated: fix

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new f2361a9  fix
f2361a9 is described below

commit f2361a998282cb02b1dbd252bc359c5136034b53
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Wed Oct 14 15:04:25 2020 +0200

    fix
---
 src/lib/anastasis_api_backup_redux.c   |  2 +-
 src/lib/anastasis_api_recovery_redux.c |  5 +++--
 src/lib/anastasis_api_redux.c          | 18 ++++++------------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/lib/anastasis_api_backup_redux.c 
b/src/lib/anastasis_api_backup_redux.c
index 2cd29ee..30ed18d 100644
--- a/src/lib/anastasis_api_backup_redux.c
+++ b/src/lib/anastasis_api_backup_redux.c
@@ -142,7 +142,7 @@ ANASTASIS_backup_start (const struct 
GNUNET_CONFIGURATION_Handle *cfg)
   initial_state = json_pack ("{s:s, s:o}",
                              "backup_state",
                              ANASTASIS_generic_state_to_string (
-                               ContinentSelectionState),
+                               ANASTASIS_BACKUP_STATE_CONTINENT_SELECTION),
                              "continents",
                              continents);
   GNUNET_assert (NULL != initial_state);
diff --git a/src/lib/anastasis_api_recovery_redux.c 
b/src/lib/anastasis_api_recovery_redux.c
index d682fc2..a605ded 100644
--- a/src/lib/anastasis_api_recovery_redux.c
+++ b/src/lib/anastasis_api_recovery_redux.c
@@ -100,7 +100,7 @@ ANASTASIS_recovery_start (const struct 
GNUNET_CONFIGURATION_Handle *cfg)
   size_t index;
   json_t *root;
   json_t *continents = json_array ();
-  json_t *redux_countries = redux_countries_init ();
+  json_t *redux_countries = ANASTASIS_redux_countries_init_ ();
 
   GNUNET_assert (NULL != redux_countries);
   root = json_object_get (redux_countries, "countries");
@@ -150,7 +150,8 @@ ANASTASIS_recovery_start (const struct 
GNUNET_CONFIGURATION_Handle *cfg)
  * @param cb_cls closure for @a cb
  */
 void
-ANASTASIS_recovery_action (json_t *state,
+ANASTASIS_recovery_action (struct GNUNET_CURL_Context *ctx,
+                           json_t *state,
                            const char *action,
                            const json_t *arguments,
                            ANASTASIS_ActionCallback cb,
diff --git a/src/lib/anastasis_api_redux.c b/src/lib/anastasis_api_redux.c
index b6c2a80..9fad1a0 100644
--- a/src/lib/anastasis_api_redux.c
+++ b/src/lib/anastasis_api_redux.c
@@ -184,7 +184,7 @@ static void
 free_config_request (struct ConfigRequest *cr)
 {
   if (NULL != cr->co)
-    ANASTASIS_get_config_cancel (cr->co);
+    ANASTASIS_config_cancel (cr->co);
   if (NULL != cr->tt)
     GNUNET_SCHEDULER_cancel (cr->tt);
   GNUNET_free (cr->backend_currency);
@@ -268,14 +268,8 @@ conclude_select_country (struct SelectCountryHandle *sch)
   for (cr = sch->cr_head; NULL != cr; cr = cr->next)
     if (NULL != cr->co)
       return;
-  currency = json_string_value (json_object_get (cs->state,
+  currency = json_string_value (json_object_get (cr->sch->state,
                                                  "currency"));
-  GNUNET_assert (0 == json_object_set_new (state,
-                                           "authentication_methods",
-                                           json_object ()));
-  GNUNET_assert (0 == json_object_set_new (state,
-                                           "authentication_providers",
-                                           json_object ()));
   while (NULL != (cr = sch->cr_head))
   {
     GNUNET_CONTAINER_DLL_remove (sch->cr_head,
@@ -288,11 +282,11 @@ conclude_select_country (struct SelectCountryHandle *sch)
       continue;
     }
     add_config_to_state (cr,
-                         cs->state);
+                         cr->sch->state);
   }
   sch->cb (NULL,
            ANASTASIS_EC_NONE,
-           cs->state);
+           cr->sch->state);
   free_select_country (sch);
 }
 
@@ -303,7 +297,7 @@ config_request_timeout (void *cls)
   struct ConfigRequest *cr = cls;
 
   cr->tt = NULL;
-  ANASTASIS_get_config_cancel (cr->co);
+  ANASTASIS_config_cancel (cr->co);
   cr->co = NULL;
   conclude_select_country (cr->sch);
 }
@@ -333,7 +327,7 @@ config_cb (void *cls,
   cr->http_status = http_status;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "At %s:%d url is %s\n", __FILE__, __LINE__,
-              cs->server->backend_url);
+              cr->backend_url);
   if (MHD_HTTP_OK == http_status)
   {
     cr->backend_methods = json_incref ((json_t *) methods);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.