1 files changed, 16 insertions, 30 deletions

diff --git a/src/testing/testing_api_cmd_config.c b/src/testing/testing_api_cmd_config.c
index 58a58dc..542e140 100644
--- a/src/testing/testing_api_cmd_config.c
+++ b/src/testing/testing_api_cmd_config.c
@@ -3,14 +3,14 @@
   Copyright (C) 2019, 2021 Anastasis SARL
 
   Anastasis is free software; you can redistribute it and/or modify it under the
-  terms of the GNU Affero General Public License as published by the Free Software
+  terms of the GNU General Public License as published by the Free Software
   Foundation; either version 3, or (at your option) any later version.
 
   Anastasis is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details.
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
-  You should have received a copy of the GNU Affero General Public License along with
+  You should have received a copy of the GNU General Public License along with
   Anastasis; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
@@ -53,7 +53,7 @@ struct ConfigState
   /**
    * The salt value from server.
    */
-  struct ANASTASIS_CRYPTO_ProviderSaltP salt;
+  struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
 };
 
 
@@ -61,39 +61,26 @@ struct ConfigState
  * Function called with the results of a #ANASTASIS_get_config().
  *
  * @param cls closure
- * @param http_status HTTP status of the request
  * @param config config from the server
  */
 static void
 config_cb (void *cls,
-           unsigned int http_status,
            const struct ANASTASIS_Config *config)
 {
   struct ConfigState *ss = cls;
 
   ss->so = NULL;
-  if (http_status != ss->http_status)
+  if (config->http_status != ss->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                http_status,
-                ss->is->commands[ss->is->ip].label,
-                __FILE__,
-                __LINE__);
-    TALER_TESTING_interpreter_fail (ss->is);
+    TALER_TESTING_unexpected_status (ss->is,
+                                     config->http_status,
+                                     ss->http_status);
     return;
   }
-  if (NULL == config)
+  if (GNUNET_OK == config->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Config is NULL, command %s in %s:%u\n",
-                ss->is->commands[ss->is->ip].label,
-                __FILE__,
-                __LINE__);
-    TALER_TESTING_interpreter_fail (ss->is);
-    return;
+    ss->provider_salt = config->details.ok.provider_salt;
   }
-  ss->salt = config->salt;
   TALER_TESTING_interpreter_next (ss->is);
 }
 
@@ -113,10 +100,11 @@ config_run (void *cls,
   struct ConfigState *ss = cls;
 
   ss->is = is;
-  ss->so = ANASTASIS_get_config (is->ctx,
-                                 ss->anastasis_url,
-                                 &config_cb,
-                                 ss);
+  ss->so = ANASTASIS_get_config (
+    TALER_TESTING_interpreter_get_context (is),
+    ss->anastasis_url,
+    &config_cb,
+    ss);
   if (NULL == ss->so)
   {
     GNUNET_break (0);
@@ -167,10 +155,8 @@ config_traits (void *cls,
                unsigned int index)
 {
   struct ConfigState *ss = cls;
-
   struct TALER_TESTING_Trait traits[] = {
-    ANASTASIS_TESTING_make_trait_salt (0,
-                                       &ss->salt),
+    ANASTASIS_TESTING_make_trait_provider_salt (&ss->provider_salt),
     TALER_TESTING_trait_end ()
   };